swg-source/client-tools
1
0
Fork 0
mirror of https://github.com/SWG-Source/client-tools.git synced 2026-10-13 05:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Prevent Use of Item in Toolbar Not Contained by Player

Browse Source
This commit is contained in:
AconiteX
2021-06-03 23:21:54 -04:00
parent e5536f6837
commit 315e1d53c7
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiToolbar.cpp
+28
View File
@@ -2062,6 +2062,34 @@ bool SwgCuiToolbar::performToolbarAction(int slot, bool pet)
}
else if(item->type == CuiDragInfoTypes::CDIT_object)
{
// Validate on requested item use that we still have the item in our control.
// Addresses an exploit that allows item container transfers unintentionally.
const ClientObject* clientObject = item->getClientObject();
if(clientObject)
{
bool badObject;
const int got = clientObject->getGameObjectType();
if(got >= SharedObjectTemplate::GOT_data && got < SharedObjectTemplate::GOT_installation) // data items in toolbar must be in our data pad
{
CuiInventoryManager::isNestedDatapad(*clientObject) ? badObject = false : badObject = true;
}
else // any other usable item in toolbar must be in inventory, appearance inventory, or equipped
{
const bool inInventory = CuiInventoryManager::isNestedInventory(*clientObject);
const bool inAppearanceInventory = CuiInventoryManager::isNestedAppearanceInventory(*clientObject);
const bool isEquipped = CuiInventoryManager::isNestedEquipped(*clientObject);
inInventory || inAppearanceInventory || isEquipped ? badObject = false : badObject = true;
}
if(badObject)
{
// remove from toolbar and don't execute command
CuiSoundManager::play(CuiSounds::negative);
item->clear();
repopulateSlots();
}
}
int commandCrc = 0;
if(parent->HasProperty(OBJECT_COMMAND_CRC))
{