Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

1 files changed, 1 insertions, 20 deletions

diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index 7ac90320347..24d00235ab8 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -53,9 +53,7 @@ enum eAeranas
     FACTION_FRIENDLY        = 35,
 
     SPELL_ENVELOPING_WINDS  = 15535,
-    SPELL_SHOCK             = 12553,
-
-    C_AERANAS               = 17085
+    SPELL_SHOCK             = 12553
 };
 
 class npc_aeranas : public CreatureScript
@@ -205,22 +203,6 @@ public:
 };
 
 /*######
-## go_haaleshi_altar
-######*/
-
-class go_haaleshi_altar : public GameObjectScript
-{
-public:
-    go_haaleshi_altar() : GameObjectScript("go_haaleshi_altar") { }
-
-    bool OnGossipHello(Player* /*player*/, GameObject* go)
-    {
-        go->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000);
-        return false;
-    }
-};
-
-/*######
 ## npc_naladu
 ######*/
 
@@ -532,7 +514,6 @@ void AddSC_hellfire_peninsula()
 {
     new npc_aeranas();
     new npc_ancestral_wolf();
-    new go_haaleshi_altar();
     new npc_naladu();
     new npc_tracy_proudwell();
     new npc_trollbane();