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

fix: check a trade offer against the items the player holds

Browse Source 
A trade used the LOT and the count from the offer as the player sent
it. The offer is now resolved when it arrives and again when the trade
completes: the LOT comes from the held item, the count stops at the
held count, and an offer that names an unknown item, the same item
twice or a count of 0 is refused. The other player only receives an
item that was taken from the offering player.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 12:57:58 -06:00
parent b88168f2ed
commit c0b7a8f643
5 changed files with 143 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
dGame/TradingManager.cpp
View File

@@ -13,7 +13,9 @@
#include "CharacterComponent.h"
#include "MissionComponent.h"
#include "eMissionTaskType.h"
#include <algorithm>
#include <ranges>
#include <set>
namespace {
std::unique_ptr<Trade> g_EmptyTrade;
@@ -27,6 +29,26 @@ Trade::Trade(LWOOBJID tradeId, LWOOBJID participantA, LWOOBJID participantB) {
m_ParticipantB = participantB;
}
std::optional<std::vector<TradeItem>> Trade::ResolveOffer(
const std::vector<TradeItem>& offered,
const std::function<std::optional<HeldTradeItem>(LWOOBJID)>& findHeld) {
std::vector<TradeItem> resolved;
resolved.reserve(offered.size());
std::set<LWOOBJID> seen;
for (const auto& tradeItem : offered) {
// The client keeps its offer by item ID, so an item is only ever in it once
if (tradeItem.itemCount == 0 || !seen.insert(tradeItem.itemId).second) return std::nullopt;
const auto held = findHeld(tradeItem.itemId);
if (!held || held->count == 0) return std::nullopt;
resolved.push_back({ tradeItem.itemId, held->lot, std::min(tradeItem.itemCount, held->count) });
}
return resolved;
}
Trade::~Trade() {
}
@@ -149,6 +171,20 @@ void Trade::Complete() {
return;
}
// The inventories may have changed since the offers were made, so check the offers against them again
const auto holds = [](const InventoryComponent* const inventory) {
return [inventory](const LWOOBJID itemId) -> std::optional<HeldTradeItem> {
const auto* const item = inventory->FindItemById(itemId);
if (!item) return std::nullopt;
return HeldTradeItem{ item->GetLot(), item->GetCount() };
};
};
if (ResolveOffer(m_ItemsA, holds(inventoryA)) != m_ItemsA || ResolveOffer(m_ItemsB, holds(inventoryB)) != m_ItemsB) {
LOG("The items offered by %s and %s no longer match what they hold, aborting trade", characterA->GetName().c_str(), characterB->GetName().c_str());
return;
}
for (const auto& tradeItem : m_ItemsA) {
auto* itemToRemove = inventoryA->FindItemById(tradeItem.itemId);
if (itemToRemove) {
@@ -194,7 +230,7 @@ void Trade::Complete() {
InventoryComponent* to, const LWOOBJID fromCharacter, const LWOOBJID toCharacter) {
for (const auto& tradeItem : items) {
auto* itemToRemove = from->FindItemById(tradeItem.itemId);
if (!itemToRemove) continue;
if (!itemToRemove || itemToRemove->GetCount() < tradeItem.itemCount) continue;
// A whole item keeps its data (subkey, config) but gets a new object id, as upstream: reusing the id would
// leave two objects with one id if the server stopped between the two players' saves. A stack merges into
@@ -203,17 +239,19 @@ void Trade::Complete() {
const auto config = itemToRemove->GetConfig();
const auto subKey = itemToRemove->GetSubKey();
const auto bound = itemToRemove->GetBound();
// Taking the whole stack removes the item, so read its LOT first
const LOT lot = itemToRemove->GetLot();
itemToRemove->SetCount(itemToRemove->GetCount() - tradeItem.itemCount);
fromMissions->Progress(eMissionTaskType::GATHER, tradeItem.itemLot, LWOOBJID_EMPTY, "", -static_cast<int32_t>(tradeItem.itemCount));
fromMissions->Progress(eMissionTaskType::GATHER, lot, LWOOBJID_EMPTY, "", -static_cast<int32_t>(tradeItem.itemCount));
// Live sent the trade's ID with the traded items
ReceiveItemOptions options{};
options.metrics.transactionId = tradeId;
const auto received = whole
? to->ReceiveItem(LWOOBJID_EMPTY, tradeItem.itemLot, tradeItem.itemCount, eLootSourceType::TRADE, config, subKey, bound, options)
: to->ReceiveItem(LWOOBJID_EMPTY, tradeItem.itemLot, tradeItem.itemCount, eLootSourceType::TRADE, {}, LWOOBJID_EMPTY, false, options);
? to->ReceiveItem(LWOOBJID_EMPTY, lot, tradeItem.itemCount, eLootSourceType::TRADE, config, subKey, bound, options)
: to->ReceiveItem(LWOOBJID_EMPTY, lot, tradeItem.itemCount, eLootSourceType::TRADE, {}, LWOOBJID_EMPTY, false, options);
EconomyLedger::RecordTransfer({ .method = IEconomyLedger::eTransferMethod::TRADE, .itemId = tradeItem.itemId, .newItemId = received.id,
.lot = tradeItem.itemLot, .count = tradeItem.itemCount, .fromCharacter = fromCharacter, .toCharacter = toCharacter, .zone = zone,
.lot = lot, .count = tradeItem.itemCount, .fromCharacter = fromCharacter, .toCharacter = toCharacter, .zone = zone,
.merged = received.merged });
}
};