Created
April 8, 2012 19:11
-
-
Save Subv/2339334 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp | |
index cf14bb0..2b9f944 100755 | |
--- a/src/server/game/Entities/Unit/Unit.cpp | |
+++ b/src/server/game/Entities/Unit/Unit.cpp | |
@@ -1540,7 +1540,8 @@ void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffe | |
DamageInfo dmgInfo = DamageInfo(this, victim, damage, spellInfo, schoolMask, damagetype); | |
// Magic damage, check for resists | |
- if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0) | |
+ // Ignore spells that cant be resisted | |
+ if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0 && (spellInfo->AttributesEx4 & SPELL_ATTR4_IGNORE_RESISTANCES) == 0) | |
{ | |
float victimResistance = float(victim->GetResistance(schoolMask)); | |
victimResistance += float(GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, schoolMask)); | |
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h | |
index df524b1..f578e24 100755 | |
--- a/src/server/game/Miscellaneous/SharedDefines.h | |
+++ b/src/server/game/Miscellaneous/SharedDefines.h | |
@@ -410,7 +410,7 @@ enum SpellAttr3 | |
enum SpellAttr4 | |
{ | |
- SPELL_ATTR4_UNK0 = 0x00000001, // 0 | |
+ SPELL_ATTR4_IGNORE_RESISTANCES = 0x00000001, // 0 spells with this attribute will completely ignore the target resistances (theese spells cant be resisted) | |
SPELL_ATTR4_PROC_ONLY_ON_CASTER = 0x00000002, // 1 proc only on effects with TARGET_UNIT_CASTER? | |
SPELL_ATTR4_UNK2 = 0x00000004, // 2 | |
SPELL_ATTR4_UNK3 = 0x00000008, // 3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment