diff options
| author | Wyreth <32145860+Wyreth@users.noreply.github.com> | 2017-12-17 16:29:22 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-12-17 16:29:22 +0100 |
| commit | ae878e18ef121b7b1960f40f2b0f99debd2155d8 (patch) | |
| tree | b9bc18dd5429eadcfe1a74c14579d085df42617d /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 1cedcf0bf349581b6fff210e4c325e25b51ccf0c (diff) | |
Core/Creature: implement school immunity for creatures in creature_template (#20709)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ddcc9e7cae4..69470e119c6 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -414,8 +414,8 @@ void ObjectMgr::LoadCreatureTemplates() "spell2, spell3, spell4, spell5, spell6, spell7, spell8, PetSpellDataId, VehicleId, mingold, maxgold, AIName, MovementType, " // 62 63 64 65 66 67 68 69 "InhabitType, HoverHeight, HealthModifier, ManaModifier, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, " - // 70 71 72 73 74 - "movementId, RegenHealth, mechanic_immune_mask, flags_extra, ScriptName " + // 70 71 72 73 74 75 + "movementId, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName " "FROM creature_template;"); if (!result) @@ -511,11 +511,12 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) creatureTemplate.ModExperience = fields[68].GetFloat(); creatureTemplate.RacialLeader = fields[69].GetBool(); - creatureTemplate.movementId = fields[70].GetUInt32(); - creatureTemplate.RegenHealth = fields[71].GetBool(); - creatureTemplate.MechanicImmuneMask = fields[72].GetUInt32(); - creatureTemplate.flags_extra = fields[73].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[74].GetString()); + creatureTemplate.movementId = fields[70].GetUInt32(); + creatureTemplate.RegenHealth = fields[71].GetBool(); + creatureTemplate.MechanicImmuneMask = fields[72].GetUInt32(); + creatureTemplate.SpellSchoolImmuneMask = fields[73].GetUInt8(); + creatureTemplate.flags_extra = fields[74].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[75].GetString()); } void ObjectMgr::LoadCreatureTemplateAddons() |