From f9fd80251c2e82fc46f822c1d65d57828bf0b690 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 29 Oct 2014 21:13:21 +0100 Subject: Core/Entites: ObjectGuid construction refactor (cherry picked from commit 15fbb6f46fb24fdc6f91786543b32f247e6525fc) --- src/server/game/Maps/Map.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/game/Maps/Map.cpp') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index bf4a8d1b197..5f65a14f262 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3082,7 +3082,9 @@ bool Map::CheckRespawn(RespawnInfo* info) } // next, check linked respawn time - ObjectGuid thisGUID = ObjectGuid((info->type == SPAWN_TYPE_GAMEOBJECT) ? HighGuid::GameObject : HighGuid::Unit, info->entry, info->spawnId); + ObjectGuid thisGUID = info->type == SPAWN_TYPE_GAMEOBJECT + ? ObjectGuid::Create(info->entry, info->spawnId) + : ObjectGuid::Create(info->entry, info->spawnId); if (time_t linkedTime = GetLinkedRespawnTime(thisGUID)) { time_t now = GameTime::GetGameTime(); -- cgit v1.2.3