aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-08-08 23:54:47 +0200
committertreeston <treeston.mmoc@gmail.com>2016-08-08 23:54:47 +0200
commit5b6eb29b74bbc9e62f12c449b1896a075bdd25a2 (patch)
tree3cc44006809ef857e2a3a4683697ff5475811ae4 /src
parent5588881be21fbd48a34fb705f813cdc095aeca13 (diff)
Entities/Creature: Fix spawn health, fdd78d2 follow-up. Fixes and closes #17757.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index a5e28e8c5e4..b8170af0436 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1360,6 +1360,7 @@ bool Creature::LoadCreatureFromDB(ObjectGuid::LowType spawnId, Map* map, bool ad
}
m_spawnId = spawnId;
+ m_creatureData = data;
if (!Create(map->GenerateLowGuid<HighGuid::Unit>(), map, data->phaseMask, data->id, data->posX, data->posY, data->posZ, data->orientation, data))
return false;
@@ -1388,8 +1389,6 @@ bool Creature::LoadCreatureFromDB(ObjectGuid::LowType spawnId, Map* map, bool ad
// checked at creature_template loading
m_defaultMovementType = MovementGeneratorType(data->movementType);
- m_creatureData = data;
-
if (addToMap && !GetMap()->AddToMap(this))
return false;
return true;