mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-17 01:05:28 +00:00
fix(inventory): UpdateInventoryGroupContents CLEAR empties the group, as the client
LWOInventoryComponent_Common::msgUpdateInventoryGroupContents (0x00ce1f50) takes ADD, REMOVE and CLEAR; CLEAR removes every LOT from the group. The server logged CLEAR as an invalid action and kept the LOTs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2032,6 +2032,10 @@ void InventoryComponent::UpdateGroup(const GroupUpdate& groupUpdate) {
|
||||
groupItr->lots.erase(groupUpdate.lot);
|
||||
break;
|
||||
}
|
||||
case GroupUpdateCommand::CLEAR_LOTS: {
|
||||
groupItr->lots.clear();
|
||||
break;
|
||||
}
|
||||
case GroupUpdateCommand::MODIFY: {
|
||||
groupItr->groupName = groupUpdate.groupName;
|
||||
break;
|
||||
@@ -2420,6 +2424,7 @@ void InventoryComponent::OnUpdateInventoryGroupContents(const GameMessages::Upda
|
||||
|
||||
if (msg.action == "ADD") groupUpdate.command = GroupUpdateCommand::ADD_LOT;
|
||||
else if (msg.action == "REMOVE") groupUpdate.command = GroupUpdateCommand::REMOVE_LOT;
|
||||
else if (msg.action == "CLEAR") groupUpdate.command = GroupUpdateCommand::CLEAR_LOTS;
|
||||
else {
|
||||
LOG("Invalid action %s", msg.action.c_str());
|
||||
return;
|
||||
|
||||
@@ -86,6 +86,7 @@ public:
|
||||
MODIFY,
|
||||
REMOVE,
|
||||
REMOVE_LOT,
|
||||
CLEAR_LOTS,
|
||||
};
|
||||
|
||||
// Based on the command, certain fields will be used or not used.
|
||||
|
||||
@@ -78,3 +78,13 @@ TEST_F(InventoryGroupTests, TheModelVaultUsesTheModelsGroups) {
|
||||
EXPECT_EQ(Groups(eInventoryType::MODELS)[0].lots.size(), 1u);
|
||||
EXPECT_FALSE(inventory->GetGroups().contains(eInventoryType::VAULT_MODELS));
|
||||
}
|
||||
|
||||
TEST_F(InventoryGroupTests, ClearEmptiesAGroup) {
|
||||
Group("ADD", "user_group1", u"bricks");
|
||||
Contents("ADD", "user_group1", 3001);
|
||||
Contents("ADD", "user_group1", 3002);
|
||||
Contents("CLEAR", "user_group1", 0);
|
||||
|
||||
ASSERT_EQ(Groups().size(), 1u);
|
||||
EXPECT_TRUE(Groups()[0].lots.empty());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user