tweaks: improve trading

Author: Jacobwasbeast

Code/client/Services/Generic/InventoryService.cpp

@@ -140,6 +140,22 @@ void InventoryService::OnEquipmentChangeEvent(const EquipmentChangeEvent& acEven
 
 void InventoryService::OnNotifyInventoryChanges(const NotifyInventoryChanges& acMessage) noexcept
 {
+    TESObjectREFR* pObject = Utils::GetByServerId<TESObjectREFR>(acMessage.ServerId);
+    if (!pObject)
+    {
+        spdlog::error("{}: could not find server id {:X} for inventory change", __FUNCTION__, acMessage.ServerId);
+        return;
+    }
+
+    Actor* pActor = Cast<Actor>(pObject);
+
+    if (acMessage.Silent)
+    {
+        ScopedInventoryOverride _;
+        pObject->AddOrRemoveItem(acMessage.Item);
+        return;
+    }
+
     std::optional<uint32_t> dropInstanceId{};
     if (acMessage.HasDropInstanceId)
         dropInstanceId = acMessage.DropInstanceId;
@@ -161,8 +177,6 @@ void InventoryService::OnNotifyInventoryChanges(const NotifyInventoryChanges& ac
         pDropRotation = &dropRotation;
     }
 
-    Actor* pActor = Utils::GetByServerId<Actor>(acMessage.ServerId);
-
     if (acMessage.Drop)
     {
         if (!pActor)
@@ -221,14 +235,10 @@ void InventoryService::OnNotifyInventoryChanges(const NotifyInventoryChanges& ac
         }
     }
 
-    TESObjectREFR* pObject = Utils::GetByServerId<TESObjectREFR>(acMessage.ServerId);
-    if (!pObject)
-        return;
-
     ScopedInventoryOverride _;
 
-    if (auto* pActorObject = Cast<Actor>(pObject))
-        pActorObject->DropOrPickUpObject(acMessage.Item, pDropLocation, pDropRotation);
+    if (pActor)
+        pActor->DropOrPickUpObject(acMessage.Item, pDropLocation, pDropRotation);
     else
         pObject->AddOrRemoveItem(acMessage.Item);
 }

Code/encoding/Messages/NotifyInventoryChanges.cpp

@@ -6,6 +6,7 @@ void NotifyInventoryChanges::SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter
     Serialization::WriteVarInt(aWriter, ServerId);
     Item.Serialize(aWriter);
     Serialization::WriteBool(aWriter, Drop);
+    Serialization::WriteBool(aWriter, Silent);
     Serialization::WriteBool(aWriter, HasDropInstanceId);
     if (HasDropInstanceId)
         Serialization::WriteVarInt(aWriter, DropInstanceId);
@@ -24,6 +25,7 @@ void NotifyInventoryChanges::DeserializeRaw(TiltedPhoques::Buffer::Reader& aRead
     ServerId = Serialization::ReadVarInt(aReader) & 0xFFFFFFFF;
     Item.Deserialize(aReader);
     Drop = Serialization::ReadBool(aReader);
+    Silent = Serialization::ReadBool(aReader);
     HasDropInstanceId = Serialization::ReadBool(aReader);
     if (HasDropInstanceId)
         DropInstanceId = Serialization::ReadVarInt(aReader) & 0xFFFFFFFF;

Code/encoding/Messages/NotifyInventoryChanges.h

@@ -19,14 +19,15 @@ struct NotifyInventoryChanges final : ServerMessage
 
     bool operator==(const NotifyInventoryChanges& acRhs) const noexcept
     {
-        return GetOpcode() == acRhs.GetOpcode() && ServerId == acRhs.ServerId && Item == acRhs.Item && Drop == acRhs.Drop && HasDropInstanceId == acRhs.HasDropInstanceId &&
+        return GetOpcode() == acRhs.GetOpcode() && ServerId == acRhs.ServerId && Item == acRhs.Item && Drop == acRhs.Drop && Silent == acRhs.Silent && HasDropInstanceId == acRhs.HasDropInstanceId &&
                (!HasDropInstanceId || DropInstanceId == acRhs.DropInstanceId) && HasDropLocation == acRhs.HasDropLocation && (!HasDropLocation || DropLocation == acRhs.DropLocation) && HasDropRotation == acRhs.HasDropRotation &&
                (!HasDropRotation || DropRotation == acRhs.DropRotation);
     }
 
     uint32_t ServerId{};
     Inventory::Entry Item{};
     bool Drop = false;
+    bool Silent = false;
     bool HasDropInstanceId = false;
     uint32_t DropInstanceId = 0;
     bool HasDropLocation = false;

Code/server/Services/TradeService.cpp

@@ -510,10 +510,10 @@ void TradeService::FinalizeTrade(TradeSession& aSession) noexcept
             notifyRemoval.ServerId = World::ToInteger(*fromCharacter);
             notifyRemoval.Item = removal;
             notifyRemoval.Drop = false;
-            if (!GameServer::Get()->SendToPlayersInRange(notifyRemoval, *fromCharacter))
+            notifyRemoval.Silent = true;
+            if (!GameServer::Get()->SendToPlayersInRange(notifyRemoval, *fromCharacter, apFrom))
                 spdlog::error("[TradeService]: Failed to broadcast inventory removal for {}", apFrom->GetId());
             apFrom->Send(notifyRemoval);
-
             Inventory::Entry addition = item;
             addition.Count = std::abs(item.Count);
             toInventory.AddOrRemoveEntry(addition);
@@ -522,7 +522,8 @@ void TradeService::FinalizeTrade(TradeSession& aSession) noexcept
             notifyAddition.ServerId = World::ToInteger(*toCharacter);
             notifyAddition.Item = addition;
             notifyAddition.Drop = false;
-            if (!GameServer::Get()->SendToPlayersInRange(notifyAddition, *toCharacter))
+            notifyAddition.Silent = true;
+            if (!GameServer::Get()->SendToPlayersInRange(notifyAddition, *toCharacter, apTo))
                 spdlog::error("[TradeService]: Failed to broadcast inventory addition for {}", apTo->GetId());
             apTo->Send(notifyAddition);
         }