sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed hooks OnPlayerJoinArena and OnPlayerJoinBG

Browse Source
This commit is contained in:
Matteo Emili
2017-01-29 22:03:03 +01:00
committed by Yehonal
parent 25a38da1e3
commit cbdecc0828
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Handlers/BattleGroundHandler.cpp
+4 -4
View File
@@ -169,7 +169,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL); sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL);
SendPacket(&data); SendPacket(&data);
sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId)); sScriptMgr->OnPlayerJoinBG(_player);
} }
// check if group can queue: // check if group can queue:
@@ -249,7 +249,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
member->GetSession()->SendPacket(&data); 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); sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, arenatype, TEAM_NEUTRAL);
SendPacket(&data); SendPacket(&data);
sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId)); sScriptMgr->OnPlayerJoinArena(_player);
} }
// check if group can queue: // check if group can queue:
else else
@@ -755,7 +755,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
member->GetSession()->SendPacket(&data); member->GetSession()->SendPacket(&data);
sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId())); sScriptMgr->OnPlayerJoinArena(member);
} }
// pussywizard: schedule update for rated arena // pussywizard: schedule update for rated arena
src/game/Scripting/ScriptMgr.cpp
+4 -4
View File
@@ -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); 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) void ScriptMgr::OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid)
src/game/Scripting/ScriptMgr.h
+4 -4
View File
@@ -872,10 +872,10 @@ class PlayerScript : public ScriptObject
virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { } virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
// After player enters queue for BG // After player enters queue for BG
virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { } virtual void OnPlayerJoinBG(Player* /*player*/) { }
// After player enters queue for Arena // After player enters queue for Arena
virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { } virtual void OnPlayerJoinArena(Player* /*player*/) { }
//After looting item //After looting item
virtual void OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid) { } 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 OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update); 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 OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
void OnPlayerJoinBG(Player* player, Battleground* bg); void OnPlayerJoinBG(Player* player);
void OnPlayerJoinArena(Player* player, Battleground* bg); void OnPlayerJoinArena(Player* player);
void OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid); void OnLootItem(Player* player, Item* item, uint32 count, uint64 lootguid);
void OnCreateItem(Player* player, Item* item, uint32 count); void OnCreateItem(Player* player, Item* item, uint32 count);
void OnQuestRewardItem(Player* player, Item* item, uint32 count); void OnQuestRewardItem(Player* player, Item* item, uint32 count);