fix HandleAreaSpiritHealerQueryOpcode and HandleAreaSpiritHealerQueueOpcode broken in f0632b948d

--HG--
branch : trunk

1 files changed, 2 insertions, 33 deletions

diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 5565fad93c1..7e77f3fff20 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -35,12 +35,6 @@
 #include "Object.h"
 #include "Opcodes.h"
 
-// Temporal fix to wintergrasp spirit guides till 3.2
-// 
-//#include "OutdoorPvPWG.h"
-//#include "OutdoorPvPMgr.h"
-// WG end
-
 void WorldSession::HandleBattlemasterHelloOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
@@ -593,20 +587,8 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode( WorldPacket & recv_data )
     if(!unit->isSpiritService())                            // it's not spirit service
         return;
 
-/*    if (bg)
-    {
+    if (bg)
         sBattleGroundMgr.SendAreaSpiritHealerQueryOpcode(_player, bg, guid);
-    }
-    else
-    {  // Wintergrasp Hack till 3.2 and it's implemented as BG
-        if (GetPlayer()->GetZoneId() == 4197)
-        {
-            OutdoorPvPWG *pvpWG = (OutdoorPvPWG*)sOutdoorPvPMgr.GetOutdoorPvPToZoneId(4197);
-            if (pvpWG && pvpWG->isWarTime())
-                pvpWG->SendAreaSpiritHealerQueryOpcode(_player, guid);
-        }
-    }
-*/
 }
 
 
@@ -626,21 +608,8 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode( WorldPacket & recv_data )
     if(!unit->isSpiritService())                            // it's not spirit service
         return;
 
-/*    if (bg)
-    {
+    if (bg)
         bg->AddPlayerToResurrectQueue(guid, _player->GetGUID());
-    }
-    else
-    {  // Wintergrasp Hack till 3.2 and it's implemented as BG
-        if (GetPlayer()->GetZoneId() == 4197)
-        {
-            OutdoorPvPWG *pvpWG = (OutdoorPvPWG*)sOutdoorPvPMgr.GetOutdoorPvPToZoneId(4197);
-            if (pvpWG && pvpWG->isWarTime())
-                pvpWG->AddPlayerToResurrectQueue(guid, _player->GetGUID());
-        }
-    }
-
-*/
 }