From cbdecc082809ce37ad7bf0f825b63a88c0f94e38 Mon Sep 17 00:00:00 2001
From: Matteo Emili <matteo.emili14@gmail.com>
Date: Sun, 29 Jan 2017 22:03:03 +0100
Subject: [PATCH] Fixed hooks OnPlayerJoinArena and OnPlayerJoinBG

---
 src/game/Handlers/BattleGroundHandler.cpp | 8 ++++----
 src/game/Scripting/ScriptMgr.cpp          | 8 ++++----
 src/game/Scripting/ScriptMgr.h            | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/game/Handlers/BattleGroundHandler.cpp b/src/game/Handlers/BattleGroundHandler.cpp
index 922ad3020..0a44ef087 100644
--- a/src/game/Handlers/BattleGroundHandler.cpp
+++ b/src/game/Handlers/BattleGroundHandler.cpp
@@ -169,7 +169,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
         sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL);
         SendPacket(&data);
 
-        sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
+        sScriptMgr->OnPlayerJoinBG(_player);
 		
     }
     // check if group can queue:
@@ -249,7 +249,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
             sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
             member->GetSession()->SendPacket(&data);
 
-            sScriptMgr->OnPlayerJoinBG(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
+            sScriptMgr->OnPlayerJoinBG(member);
         }
     }
 }
@@ -659,7 +659,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
         sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, arenatype, TEAM_NEUTRAL);
         SendPacket(&data);
 
-        sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
+        sScriptMgr->OnPlayerJoinArena(_player);
     }
     // check if group can queue:
     else
@@ -755,7 +755,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
             sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
             member->GetSession()->SendPacket(&data);
 
-            sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
+            sScriptMgr->OnPlayerJoinArena(member);
         }
 
         // pussywizard: schedule update for rated arena
diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/game/Scripting/ScriptMgr.cpp
index 9031dd2e8..1be672520 100644
--- a/src/game/Scripting/ScriptMgr.cpp
+++ b/src/game/Scripting/ScriptMgr.cpp
@@ -1344,14 +1344,14 @@ void ScriptMgr::OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool up
     FOREACH_SCRIPT(PlayerScript)->OnEquip(player, it, bag, slot, update);
 }
 
-void ScriptMgr::OnPlayerJoinBG(Player* player, Battleground* bg)
+void ScriptMgr::OnPlayerJoinBG(Player* player)
 {
-    FOREACH_SCRIPT(PlayerScript)->OnPlayerJoinBG(player, bg);
+    FOREACH_SCRIPT(PlayerScript)->OnPlayerJoinBG(player);
 }
 
-void ScriptMgr::OnPlayerJoinArena(Player* player, Battleground* bg)
+void ScriptMgr::OnPlayerJoinArena(Player* player)
 {
-    FOREACH_SCRIPT(PlayerScript)->OnPlayerJoinArena(player, bg);
+    FOREACH_SCRIPT(PlayerScript)->OnPlayerJoinArena(player);
 }
 
 void ScriptMgr::OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid)
diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h
index 60e450cbd..b8f798cf6 100644
--- a/src/game/Scripting/ScriptMgr.h
+++ b/src/game/Scripting/ScriptMgr.h
@@ -872,10 +872,10 @@ class PlayerScript : public ScriptObject
         virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
 
         // After player enters queue for BG
-        virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { }
+        virtual void OnPlayerJoinBG(Player* /*player*/) { }
 
         // After player enters queue for Arena
-        virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { }
+        virtual void OnPlayerJoinArena(Player* /*player*/) { }
         
         //After looting item
         virtual void OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid) { }
@@ -1205,8 +1205,8 @@ class ScriptMgr
         void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
         void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
         void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
-        void OnPlayerJoinBG(Player* player, Battleground* bg);
-        void OnPlayerJoinArena(Player* player, Battleground* bg);
+        void OnPlayerJoinBG(Player* player);
+        void OnPlayerJoinArena(Player* player);
         void OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid);
         void OnCreateItem(Player* player, Item* item, uint32 count);
         void OnQuestRewardItem(Player* player, Item* item, uint32 count);