Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Loot: Only allow the roll winner to loot the item he won in case it cannot be added to inventory instantly (full or any other reason) (#19037)

Browse Source 
(cherry-picked from ab6ac42bf0)
This commit is contained in:
xinef1
2017-02-04 14:58:50 +01:00
committed by Shauren
parent fef8e5fe14
commit 8725eec9c1
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Player/Player.cpp
View File

@@ -25751,6 +25751,13 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, AELootResult* aeResult/*
return;
}
// dont allow protected item to be looted by someone else
if (!item->rollWinnerGUID.IsEmpty() && item->rollWinnerGUID != GetGUID())
{
SendLootRelease(GetLootGUID());
return;
}
ItemPosCountVec dest;
InventoryResult msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, item->itemid, item->count);
if (msg == EQUIP_ERR_OK)

8
src/server/game/Groups/Group.cpp
View File

@@ -1283,7 +1283,8 @@ void Group::CountTheRoll(Rolls::iterator rollI)
else
{
item->is_blocked = false;
player->SendEquipError(msg, NULL, NULL, roll->itemid);
item->rollWinnerGUID = player->GetGUID();
player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
}
}
}
@@ -1335,7 +1336,8 @@ void Group::CountTheRoll(Rolls::iterator rollI)
else
{
item->is_blocked = false;
player->SendEquipError(msg, NULL, NULL, roll->itemid);
item->rollWinnerGUID = player->GetGUID();
player->SendEquipError(msg, nullptr, nullptr, roll->itemid);
}
}
else if (rollvote == DISENCHANT)
@@ -1360,7 +1362,7 @@ void Group::CountTheRoll(Rolls::iterator rollI)
for (uint32 i = 0; i < max_slot; ++i)
{
LootItem* lootItem = loot.LootItemInSlot(i, player);
player->SendEquipError(msg, NULL, NULL, lootItem->itemid);
player->SendEquipError(msg, nullptr, nullptr, lootItem->itemid);
player->SendItemRetrievalMail(lootItem->itemid, lootItem->count);
}
}

8
src/server/game/Loot/Loot.cpp
View File

@@ -55,6 +55,7 @@ LootItem::LootItem(LootStoreItem const& li)
is_blocked = 0;
is_underthreshold = 0;
is_counted = 0;
rollWinnerGUID = ObjectGuid::Empty;
canSave = true;
}
@@ -518,6 +519,13 @@ void Loot::BuildLootResponse(WorldPackets::Loot::LootResponse& packet, Player* v
// => item is lootable
slot_type = LOOT_SLOT_TYPE_ALLOW_LOOT;
}
else if (!items[i].rollWinnerGUID.IsEmpty())
{
if (items[i].rollWinnerGUID == viewer->GetGUID())
slot_type = LOOT_SLOT_TYPE_OWNER;
else
continue;
}
else
// item shall not be displayed.
continue;

1
src/server/game/Loot/Loot.h
View File

@@ -140,6 +140,7 @@ struct TC_GAME_API LootItem
uint8 context;
ConditionContainer conditions; // additional loot condition
GuidSet allowedGUIDs;
ObjectGuid rollWinnerGUID; // Stores the guid of person who won loot, if his bags are full only he can see the item in loot list!
uint8 count : 8;
bool is_looted : 1;
bool is_blocked : 1;