Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 07:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: adapt the trade's model check to the moderation status sent for a blueprint

Browse Source 
The blueprint data a world server sends for a stored brick built model
says that the model is approved, and the client goes by that over the
status the item itself carries. A model item that names a blueprint is
taken into a trade for that reason, and the item's own status only
decides for a model without one.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 16:13:49 -06:00
parent ba0c5756ad
commit b3606a0e02
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dGame/TradingManager.cpp
View File

@@ -1,4 +1,5 @@
#include "TradingManager.h"
#include "BrickByBrick.h"
#include "EconomyLedger.h"
#include "dServer.h"
#include "EntityManager.h"
@@ -55,9 +56,13 @@ std::function<std::optional<HeldTradeItem>(LWOOBJID)> Trade::HeldIn(const Invent
return [&inventory](const LWOOBJID itemId) -> std::optional<HeldTradeItem> {
const auto* const item = inventory.FindItemById(itemId);
if (!item) return std::nullopt;
// The blueprint data sent for a stored model says it is approved (BlueprintMetadata), and the client goes
// by that over the status the item itself carries
const bool hasBlueprint = item->GetLot() == BrickBuiltModelLot
&& BrickByBrick::ConfigObjectId(item->GetConfig(), u"blueprintid") != LWOOBJID_EMPTY;
return HeldTradeItem{
item->GetLot(), item->GetCount(), item->GetBound(), item->IsEquipped(),
inventory.CanDelete(*item), IsApproved(item->GetLot(), item->GetConfig())
inventory.CanDelete(*item), hasBlueprint || IsApproved(item->GetLot(), item->GetConfig())
};
};
}