Fix sending trade model data to server

Rivixer · Jun 13, 2023 · 25783b7 · 25783b7
1 parent f618835
commit 25783b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/WZIMopoly/Models/GameScene/TradeModel.cs b/WZIMopoly/Models/GameScene/TradeModel.cs
@@ -92,6 +92,18 @@ public TradeModel(List<TileController> tiles, List<PlayerInfoController> playerI
         /// </summary>
         public int TotalValue => ChosenOfferorTilesValue + ChosenRecipientTilesValue + Math.Abs(OfferedMoney);
 
+        /// <summary>
+        /// Resets the trade model.
+        /// </summary>
+        public void Reset()
+        {
+            Offeror = null;
+            Recipient = null;
+            ChosenOfferorTiles.Clear();
+            ChosenRecipientTiles.Clear();
+            OfferedMoney = 0;
+        }
+
         /// <summary>
         /// Updates the trade model.
         /// </summary>

diff --git a/WZIMopoly/Scenes/GameScene.cs b/WZIMopoly/Scenes/GameScene.cs
@@ -451,15 +451,14 @@ private void InitializeButtons()
                 if (GameSettings.CurrentPlayer.PlayerStatus == PlayerStatus.Trading)
                 {
                     GameSettings.CurrentPlayer.PlayerStatus = PlayerStatus.BeforeRollingDice;
+                    var tradeModel = _tradeController.Model;
+                    tradeModel.Reset();
                 }
                 else if (GameSettings.CurrentPlayer.PlayerStatus == PlayerStatus.BeforeRollingDice)
                 {
                     var tradeModel = _tradeController.Model;
+                    tradeModel.Reset();
                     tradeModel.Offeror = GameSettings.CurrentPlayer;
-                    tradeModel.Recipient = null;
-                    tradeModel.OfferedMoney = 0;
-                    tradeModel.ChosenOfferorTiles.Clear();
-                    tradeModel.ChosenRecipientTiles.Clear();
                     GameSettings.CurrentPlayer.PlayerStatus = PlayerStatus.Trading;
                 }                
             };