From 5b6eb29b74bbc9e62f12c449b1896a075bdd25a2 Mon Sep 17 00:00:00 2001 From: treeston Date: Mon, 8 Aug 2016 23:54:47 +0200 Subject: Entities/Creature: Fix spawn health, fdd78d2 follow-up. Fixes and closes #17757. --- src/server/game/Entities/Creature/Creature.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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(), 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; -- cgit v1.2.3