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

Core/Items: fix deletion of items when the bag they are in gets deleted on load. also checks for items that have no real bag for possible expoits.

Browse Source
This commit is contained in:
Kandera
2012-05-08 09:15:52 -04:00
parent 5b02191a1d
commit d2a33afc37
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+18
View File
@@ -17606,6 +17606,7 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff)
uint32 zoneId = GetZoneId(); uint32 zoneId = GetZoneId();
std::map<uint64, Bag*> bagMap; // fast guid lookup for bags std::map<uint64, Bag*> bagMap; // fast guid lookup for bags
std::map<uint64, Bag*> invalidBagMap; // fast guid lookup for bags
std::list<Item*> problematicItems; std::list<Item*> problematicItems;
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
@@ -17650,9 +17651,15 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff)
// Remember bags that may contain items in them // Remember bags that may contain items in them
if (err == EQUIP_ERR_OK) if (err == EQUIP_ERR_OK)
{
if (IsBagPos(item->GetPos())) if (IsBagPos(item->GetPos()))
if (Bag* pBag = item->ToBag()) if (Bag* pBag = item->ToBag())
bagMap[item->GetGUIDLow()] = pBag; bagMap[item->GetGUIDLow()] = pBag;
}
else
if (IsBagPos(item->GetPos()))
if (Bag* pBag = item->ToBag())
invalidBagMap[item->GetGUIDLow()] = pBag;
} }
else else
{ {
@@ -17666,6 +17673,17 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff)
if (err == EQUIP_ERR_OK) if (err == EQUIP_ERR_OK)
item = StoreItem(dest, item, true); item = StoreItem(dest, item, true);
} }
else if (invalidBagMap.find(bagGuid) != invalidBagMap.end() && std::find(problematicItems.begin(),problematicItems.end(),(*invalidBagMap.find(bagGuid))))
err = EQUIP_ERR_INT_BAG_ERROR;
else
{
sLog->outError("Player::_LoadInventory: player (GUID: %u, name: '%s') has item (GUID: %u, entry: %u) which doesnt have a valid bag (Bag GUID: %u, slot: %u). Possible cheat?",
GetGUIDLow(), GetName(), item->GetGUIDLow(), item->GetEntry(), bagGuid, slot);
item->DeleteFromInventoryDB(trans);
delete item;
continue;
}
} }
// Item's state may have changed after storing // Item's state may have changed after storing