Fix trades with no remaining notifications not clearing

Fixes #70 where trades completed while both parties were online weren't being cleared and would just pile up.
thomotron · Dec 5, 2022 · db0cd25 · db0cd25
1 parent 835e62d
commit db0cd25
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Common/Trading/ServerTrading.cs b/Common/Trading/ServerTrading.cs
@@ -426,6 +426,12 @@ private void updateTradeStatusPacketHandler(string connectionId, UpdateTradeStat
                     // Return the other party's items to them and check them off the pending notification list
                     sendCompleteTradePacket(otherPartyConnectionId, trade.TradeId, true, packet.Uuid, otherPartyItems);
                     completedTrade.PendingNotification.Remove(otherPartyUuid);
+
+                    // Prune the trade if there aren't any parties awaiting notification
+                    if (completedTrade.PendingNotification.Count == 0)
+                    {
+                        completedTrades.Remove(trade.TradeId);
+                    }
                 }
                 else
                 {
@@ -475,6 +481,12 @@ private void updateTradeStatusPacketHandler(string connectionId, UpdateTradeStat
                         // Give the sender's items to the other party and check them off the pending notification list
                         sendCompleteTradePacket(otherPartyConnectionId, trade.TradeId, false, packet.Uuid, items);
                         completedTrade.PendingNotification.Remove(otherPartyUuid);
+
+                        // Prune the trade if there aren't any parties awaiting notification
+                        if (completedTrade.PendingNotification.Count == 0)
+                        {
+                            completedTrades.Remove(trade.TradeId);
+                        }
                     }
                     else
                     {