josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Loot: Pickpocketed and player corpse looted money shouldn't be shared among party members

Browse Source
This commit is contained in:
tobmaps
2011-05-11 20:39:26 +07:00
parent 275c4d11ad
commit 78362a325f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/LootHandler.cpp
+12 -1
View File
@@ -104,6 +104,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/)
return; return;
Loot *pLoot = NULL; Loot *pLoot = NULL;
bool shareMoney = true;
switch(GUID_HIPART(guid)) switch(GUID_HIPART(guid))
{ {
@@ -122,14 +123,20 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/)
Corpse *bones = ObjectAccessor::GetCorpse(*GetPlayer(), guid); Corpse *bones = ObjectAccessor::GetCorpse(*GetPlayer(), guid);
if (bones && bones->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) if (bones && bones->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
{
pLoot = &bones->loot; pLoot = &bones->loot;
shareMoney = false;
}
break; break;
} }
case HIGHGUID_ITEM: case HIGHGUID_ITEM:
{ {
if (Item *item = GetPlayer()->GetItemByGuid(guid)) if (Item *item = GetPlayer()->GetItemByGuid(guid))
{
pLoot = &item->loot; pLoot = &item->loot;
shareMoney = false;
}
break; break;
} }
case HIGHGUID_UNIT: case HIGHGUID_UNIT:
@@ -139,7 +146,11 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/)
bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed); bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass() == CLASS_ROGUE && pCreature->lootForPickPocketed);
if (ok_loot && pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) if (ok_loot && pCreature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
{
pLoot = &pCreature->loot ; pLoot = &pCreature->loot ;
if (pCreature->isAlive())
shareMoney = false;
}
break; break;
} }
@@ -149,7 +160,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recv_data*/)
if (pLoot) if (pLoot)
{ {
if (!IS_ITEM_GUID(guid) && player->GetGroup()) //item can be looted only single player if (shareMoney && player->GetGroup()) //item, pickpocket and players can be looted only single player
{ {
Group *group = player->GetGroup(); Group *group = player->GetGroup();