diff options
| author | Wyreth <32145860+Wyreth@users.noreply.github.com> | 2017-12-17 16:29:22 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-04-15 05:53:27 +0200 |
| commit | ed3b34e33f019d9200a3d003c467e0ffa351187a (patch) | |
| tree | c8fb8dd52bfc83fa2627efa5502f7d7536404f00 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | dbd9f88bf07d404336c9643dbd74f8fd80db9597 (diff) | |
Core/Creature: implement school immunity for creatures in creature_template (#20709)
(cherry picked from commit ae878e18ef121b7b1960f40f2b0f99debd2155d8)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 54e3b96a02d..a8a42d6a107 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -430,9 +430,9 @@ void ObjectMgr::LoadCreatureTemplates() // "spell1, spell2, spell3, spell4, spell5, spell6, spell7, spell8, VehicleId, mingold, maxgold, AIName, MovementType, " // 60 61 62 63 64 65 66 67 68 // "InhabitType, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, " - // 69 70 71 72 73 74 75 - // "RacialLeader, movementId, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, mechanic_immune_mask, flags_extra, " - // 76 + // 69 70 71 72 73 74 75 76 + // "RacialLeader, movementId, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, " + // 77 // "ScriptName FROM creature_template WHERE entry = ? OR 1 = ?"); WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_CREATURE_TEMPLATE); @@ -540,8 +540,9 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) creatureTemplate.WidgetSetUnitConditionID = fields[72].GetInt32(); creatureTemplate.RegenHealth = fields[73].GetBool(); creatureTemplate.MechanicImmuneMask = fields[74].GetUInt32(); - creatureTemplate.flags_extra = fields[75].GetUInt32(); - creatureTemplate.ScriptID = GetScriptId(fields[76].GetString()); + creatureTemplate.SpellSchoolImmuneMask = fields[75].GetUInt8(); + creatureTemplate.flags_extra = fields[76].GetUInt32(); + creatureTemplate.ScriptID = GetScriptId(fields[77].GetString()); } void ObjectMgr::LoadCreatureTemplateModels() |