From 103f7f5e77c5d5724f7d7bea79e4295b405d4617 Mon Sep 17 00:00:00 2001 From: Jinnaix <37972361+Jinnaix@users.noreply.github.com> Date: Tue, 17 Mar 2020 19:57:06 +0100 Subject: Scripts/Deadmines (#24323) Remove obsolete Defias Companion spawn from BlastOutDoor Event (cherry picked from commit c09d2b7206ae29c43acb1df098eceeff6db5581c) --- .../scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 1ba39bacffd..f1178a947d8 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -71,7 +71,6 @@ class instance_deadmines : public InstanceMapScript ObjectGuid DoorLeverGUID; ObjectGuid DefiasPirate1GUID; ObjectGuid DefiasPirate2GUID; - ObjectGuid DefiasCompanionGUID; uint32 State; uint32 CannonBlast_Timer; @@ -126,28 +125,24 @@ class instance_deadmines : public InstanceMapScript { Creature* DefiasPirate1 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() - 2, pIronCladDoor->GetPositionY()-7, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); Creature* DefiasPirate2 = pIronCladDoor->SummonCreature(657, pIronCladDoor->GetPositionX() + 3, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); - Creature* DefiasCompanion = pIronCladDoor->SummonCreature(3450, pIronCladDoor->GetPositionX() + 2, pIronCladDoor->GetPositionY()-6, pIronCladDoor->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3000); DefiasPirate1GUID = DefiasPirate1->GetGUID(); DefiasPirate2GUID = DefiasPirate2->GetGUID(); - DefiasCompanionGUID = DefiasCompanion->GetGUID(); } } void MoveCreaturesInside() { - if (!DefiasPirate1GUID || !DefiasPirate2GUID || !DefiasCompanionGUID) + if (!DefiasPirate1GUID || !DefiasPirate2GUID) return; Creature* pDefiasPirate1 = instance->GetCreature(DefiasPirate1GUID); Creature* pDefiasPirate2 = instance->GetCreature(DefiasPirate2GUID); - Creature* pDefiasCompanion = instance->GetCreature(DefiasCompanionGUID); - if (!pDefiasPirate1 || !pDefiasPirate2 || !pDefiasCompanion) + if (!pDefiasPirate1 || !pDefiasPirate2) return; MoveCreatureInside(pDefiasPirate1); MoveCreatureInside(pDefiasPirate2); - MoveCreatureInside(pDefiasCompanion); } void MoveCreatureInside(Creature* creature) -- cgit v1.2.3