From 68f67b5eabf92a95c56b45d7a7b70c9d7db2b81d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 23 Jan 2017 20:06:09 +0100 Subject: [PATCH] More missing parts --- src/server/game/Handlers/ChannelHandler.cpp | 10 +++++----- src/server/game/Handlers/LootHandler.cpp | 10 +++++----- src/server/game/Loot/LootMgr.cpp | 15 +++++++++++++++ src/server/game/Loot/LootMgr.h | 1 + 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index d1974d1eef..1d0bb10716 100644 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -92,7 +92,7 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket) if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam())) { - if (Channel* channel = cMgr->GetChannel(channelId, channelName, GetPlayer(), true, zone)) + if (Channel* channel = ChannelMgr::GetChannelForPlayerByNamePart(channelName, GetPlayer())) channel->LeaveChannel(GetPlayer(), true); if (channelId) @@ -369,10 +369,10 @@ void WorldSession::HandleUnsetChannelWatch(WorldPacket& recvPacket) std::string channelName; recvPacket >> channelName; - TC_LOG_DEBUG("chat.system", "CMSG_UNSET_CHANNEL_WATCH %s Channel: %s", + TC_LOG_DEBUG("chat.system", "CMSG_UNSET_CHANNEL_WATCH %s Channel: %s", GetPlayerInfo().c_str(), channelName.c_str()); - if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeam())) - if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer())) - channel->LeaveNotify(GetPlayer()->GetGUID()); + + if (Channel* channel = ChannelMgr::GetChannelForPlayerByNamePart(channelName, GetPlayer())) + channel->LeaveNotify(GetPlayer()->GetGUID()); } diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index cc193e3154..7e6d4c7e02 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -102,16 +102,16 @@ void WorldSession::HandleLootCurrencyOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "WORLD: CMSG_LOOT_CURRENCY"); Player* player = GetPlayer(); - uint64 lguid = player->GetLootGUID(); + ObjectGuid lguid = player->GetLootGUID(); Loot* loot = nullptr; uint8 lootSlot = 0; recvData >> lootSlot; - switch (GUID_HIPART(lguid)) + switch (lguid.GetHigh()) { - case HIGHGUID_UNIT: - case HIGHGUID_VEHICLE: + case HighGuid::Unit: + case HighGuid::Vehicle: { Creature* creature = player->GetMap()->GetCreature(lguid); bool lootAllowed = creature && !creature->IsAlive(); @@ -121,7 +121,7 @@ void WorldSession::HandleLootCurrencyOpcode(WorldPacket& recvData) break; } - case HIGHGUID_GAMEOBJECT: + case HighGuid::GameObject: { GameObject* go = GetPlayer()->GetMap()->GetGameObject(lguid); diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 458589e988..c0869a3e65 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -648,6 +648,21 @@ void Loot::NotifyMoneyRemoved() } } +void Loot::NotifyCurrencyRemoved(uint8 lootIndex) +{ + // notify all players that are looting this that the currency was removed + std::set::iterator i_next; + for (std::set::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next) + { + i_next = i; + ++i_next; + if (Player* player = ObjectAccessor::FindPlayer(*i)) + player->SendNotifyCurrencyLootRemoved(lootIndex); + else + PlayersLooting.erase(i); + } +} + void Loot::NotifyQuestItemRemoved(uint8 questIndex) { // when a free for all questitem is looted diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 45c53ed9b1..32b1365149 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -368,6 +368,7 @@ struct TC_GAME_API Loot void NotifyItemRemoved(uint8 lootIndex); void NotifyQuestItemRemoved(uint8 questIndex); + void NotifyCurrencyRemoved(uint8 lootIndex); void NotifyMoneyRemoved(); void AddLooter(ObjectGuid GUID) { PlayersLooting.insert(GUID); } void RemoveLooter(ObjectGuid GUID) { PlayersLooting.erase(GUID); }