[Freecol-commits] SF.net SVN: freecol:[8625] freecol/trunk/src/net/sf/freecol/common/ networking/NewLandNameMessage.java

[<mp...@us...>]

Revision: 8625
          http://freecol.svn.sourceforge.net/freecol/?rev=8625&view=rev
Author:   mpope
Date:     2011-07-05 08:49:55 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Fix broken claiming of a free tile on landing.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/common/networking/NewLandNameMessage.java

Modified: freecol/trunk/src/net/sf/freecol/common/networking/NewLandNameMessage.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/common/networking/NewLandNameMessage.java	2011-07-05 08:47:21 UTC (rev 8624)
+++ freecol/trunk/src/net/sf/freecol/common/networking/NewLandNameMessage.java	2011-07-05 08:49:55 UTC (rev 8625)
@@ -80,7 +80,7 @@
             this.welcomerId = welcomer.getId();
             this.campCount = Integer.toString(camps);
         }
-        this.acceptString = null;
+        this.acceptString = Boolean.toString(accept);
     }
 
     /**
@@ -201,7 +201,8 @@
             }
             boolean foundWelcomer = false;
             for (Tile t : tile.getSurroundingTiles(1)) {
-                if (t.getFirstUnit().getOwner() == welcomer) {
+                if (t.getFirstUnit() != null
+                    && t.getFirstUnit().getOwner() == welcomer) {
                     foundWelcomer = true;
                     break;
                 }


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