From 785f0bf5c0dc945af9da494559955ac69e5a7198 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 30 Oct 2014 20:02:42 +0100 Subject: Core/GameObjects: Updated GameObjectTemplate data structure --- src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 4af520907e7..189cc842d9b 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -71,7 +71,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) + if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spell == 17731) { FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(), 0)); return; @@ -92,7 +92,7 @@ public: void OnGameObjectRemove(GameObject* go) override { - if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) + if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spell == 17731) { FloorEruptionGUID[0].erase(go->GetGUID()); return; @@ -116,7 +116,7 @@ public: //remove all that are not present on FloorEruptionGUID[1] and update treeLen on each GUID for (std::list::const_iterator itr = nearFloorList.begin(); itr != nearFloorList.end(); ++itr) { - if (((*itr)->GetGOInfo()->displayId == 4392 || (*itr)->GetGOInfo()->displayId == 4472) && (*itr)->GetGOInfo()->trap.spellId == 17731) + if (((*itr)->GetGOInfo()->displayId == 4392 || (*itr)->GetGOInfo()->displayId == 4472) && (*itr)->GetGOInfo()->trap.spell == 17731) { ObjectGuid nearFloorGUID = (*itr)->GetGUID(); if (FloorEruptionGUID[1].find(nearFloorGUID) != FloorEruptionGUID[1].end() && (*FloorEruptionGUID[1].find(nearFloorGUID)).second == 0) -- cgit v1.2.3