mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
[11470] Final cleanup uint64 guid cases
Also drop logout player update fields cleanup that in any cases not saved.
This commit is contained in:
parent
a2b6a6fde5
commit
719e298795
26 changed files with 144 additions and 153 deletions
|
|
@ -805,11 +805,11 @@ void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANKER_ACTIVATE)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint8 unk;
|
||||
recv_data >> GoGuid >> unk;
|
||||
recv_data >> goGuid >> unk;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
if (uint32 GuildId = GetPlayer()->GetGuildId())
|
||||
|
|
@ -829,11 +829,11 @@ void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_QUERY_TAB)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint8 TabId, unk1;
|
||||
recv_data >> GoGuid >> TabId >> unk1;
|
||||
recv_data >> goGuid >> TabId >> unk1;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
uint32 GuildId = GetPlayer()->GetGuildId();
|
||||
|
|
@ -857,14 +857,14 @@ void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_DEPOSIT_MONEY)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint32 money;
|
||||
recv_data >> GoGuid >> money;
|
||||
recv_data >> goGuid >> money;
|
||||
|
||||
if (!money)
|
||||
return;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
if (GetPlayer()->GetMoney() < money)
|
||||
|
|
@ -908,14 +908,14 @@ void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_WITHDRAW_MONEY)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint32 money;
|
||||
recv_data >> GoGuid >> money;
|
||||
recv_data >> goGuid >> money;
|
||||
|
||||
if (!money)
|
||||
return;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
uint32 GuildId = GetPlayer()->GetGuildId();
|
||||
|
|
@ -961,7 +961,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_SWAP_ITEMS)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint8 BankToBank;
|
||||
|
||||
uint8 BankTab, BankTabSlot, AutoStore;
|
||||
|
|
@ -973,7 +973,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
|
|||
uint32 AutoStoreCount = 0;
|
||||
uint32 SplitedAmount = 0;
|
||||
|
||||
recv_data >> GoGuid >> BankToBank;
|
||||
recv_data >> goGuid >> BankToBank;
|
||||
|
||||
uint32 GuildId = GetPlayer()->GetGuildId();
|
||||
if (!GuildId)
|
||||
|
|
@ -1037,7 +1037,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
|
|||
}
|
||||
}
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
// Bank <-> Bank
|
||||
|
|
@ -1067,13 +1067,13 @@ void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_BUY_TAB)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint8 TabId;
|
||||
|
||||
recv_data >> GoGuid;
|
||||
recv_data >> goGuid;
|
||||
recv_data >> TabId;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
uint32 GuildId = GetPlayer()->GetGuildId();
|
||||
|
|
@ -1107,23 +1107,23 @@ void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
|
|||
{
|
||||
DEBUG_LOG("WORLD: Received (CMSG_GUILD_BANK_UPDATE_TAB)");
|
||||
|
||||
uint64 GoGuid;
|
||||
ObjectGuid goGuid;
|
||||
uint8 TabId;
|
||||
std::string Name;
|
||||
std::string IconIndex;
|
||||
|
||||
recv_data >> GoGuid;
|
||||
recv_data >> goGuid;
|
||||
recv_data >> TabId;
|
||||
recv_data >> Name;
|
||||
recv_data >> IconIndex;
|
||||
|
||||
if(Name.empty())
|
||||
if (Name.empty())
|
||||
return;
|
||||
|
||||
if(IconIndex.empty())
|
||||
if (IconIndex.empty())
|
||||
return;
|
||||
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (!GetPlayer()->GetGameObjectIfCanInteractWith(goGuid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
return;
|
||||
|
||||
uint32 GuildId = GetPlayer()->GetGuildId();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue