[Rails-commits] SF.net SVN: rails:[1494] trunk/18xx/rails/game/action

[<ev...@us...>]

Revision: 1494
          http://rails.svn.sourceforge.net/rails/?rev=1494&view=rev
Author:   evos
Date:     2011-03-06 22:28:18 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Reload fixes

Modified Paths:
--------------
    trunk/18xx/rails/game/action/BuyTrain.java
    trunk/18xx/rails/game/action/LayTile.java

Modified: trunk/18xx/rails/game/action/BuyTrain.java
===================================================================
--- trunk/18xx/rails/game/action/BuyTrain.java	2011-03-06 13:05:43 UTC (rev 1493)
+++ trunk/18xx/rails/game/action/BuyTrain.java	2011-03-06 22:28:18 UTC (rev 1494)
@@ -254,7 +254,9 @@
         if (!(action instanceof BuyTrain)) return false;
         BuyTrain a = (BuyTrain) action;
         return a.getTrain() == getTrain() && a.from == from && a.pricePaid == pricePaid
-               && a.addedCash == addedCash && a.exchangedTrainUniqueId.equals(exchangedTrainUniqueId);
+               && a.addedCash == addedCash 
+               && (a.exchangedTrainUniqueId == null && exchangedTrainUniqueId == null
+                       || a.exchangedTrainUniqueId.equals(exchangedTrainUniqueId));
     }
 
     /** Deserialize */

Modified: trunk/18xx/rails/game/action/LayTile.java
===================================================================
--- trunk/18xx/rails/game/action/LayTile.java	2011-03-06 13:05:43 UTC (rev 1493)
+++ trunk/18xx/rails/game/action/LayTile.java	2011-03-06 22:28:18 UTC (rev 1494)
@@ -250,7 +250,8 @@
         return (a.laidTileId == laidTileId
                && a.chosenHexName.equals(chosenHexName)
                && a.orientation == orientation
-               && a.relaidBaseTokensString.equals(relaidBaseTokensString));
+               && (a.relaidBaseTokensString == null && relaidBaseTokensString == null
+                       || a.relaidBaseTokensString.equals(relaidBaseTokensString)));
     }
 
     @Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.