diff options
| author | funjoker <torti-esser@web.de> | 2018-04-12 21:57:49 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-04-12 22:57:49 +0300 |
| commit | 24f51f65860d6c9dd0ee055dca93ed39dd29c687 (patch) | |
| tree | 975ad09dc31dd4ce275bbb6efd9044fd0a61f126 /src/server/game/Server | |
| parent | 1aa42e97a81e285fa34316ad9cfe9657865e3c35 (diff) | |
Core/Creatures: Update Scaling to 7.3.5 (#21521)
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/CombatLogPacketsCommon.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp index ff378e680e0..e2f18ace45e 100644 --- a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp +++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp @@ -71,7 +71,7 @@ namespace WorldPackets Class = creatureTemplate->unit_class; TargetMinScalingLevel = uint8(creatureTemplate->levelScaling->MinLevel); TargetMaxScalingLevel = uint8(creatureTemplate->levelScaling->MaxLevel); - TargetScalingLevelDelta = int8(creatureTemplate->levelScaling->DeltaLevel); + TargetScalingLevelDelta = int8(attacker->GetInt32Value(UNIT_FIELD_SCALING_LEVEL_DELTA)); return true; } @@ -88,14 +88,15 @@ namespace WorldPackets Class = creatureTemplate->unit_class; TargetMinScalingLevel = uint8(creatureTemplate->levelScaling->MinLevel); TargetMaxScalingLevel = uint8(creatureTemplate->levelScaling->MaxLevel); - TargetScalingLevelDelta = int8(creatureTemplate->levelScaling->DeltaLevel); + TargetScalingLevelDelta = int8(target->GetInt32Value(UNIT_FIELD_SCALING_LEVEL_DELTA)); return true; } template<> bool SandboxScalingData::GenerateDataForUnits<Creature, Creature>(Creature* attacker, Creature* target) { - CreatureTemplate const* creatureTemplate = target->HasScalableLevels() ? target->GetCreatureTemplate() : attacker->GetCreatureTemplate(); + Creature* accessor = target->HasScalableLevels() ? target : attacker; + CreatureTemplate const* creatureTemplate = accessor->GetCreatureTemplate(); Type = TYPE_CREATURE_TO_CREATURE_DAMAGE; PlayerLevelDelta = 0; @@ -105,7 +106,7 @@ namespace WorldPackets Class = creatureTemplate->unit_class; TargetMinScalingLevel = uint8(creatureTemplate->levelScaling->MinLevel); TargetMaxScalingLevel = uint8(creatureTemplate->levelScaling->MaxLevel); - TargetScalingLevelDelta = int8(creatureTemplate->levelScaling->DeltaLevel); + TargetScalingLevelDelta = int8(accessor->GetInt32Value(UNIT_FIELD_SCALING_LEVEL_DELTA)); return true; } |