Fix displayUnitCount calculation (this is possibly BR#2925/40 zero-si…

…zed colony bug!)
FreeCol · Sep 13, 2020 · be1114c · be1114c
1 parent 8f6bccf
commit be1114c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/net/sf/freecol/common/model/Colony.java b/src/net/sf/freecol/common/model/Colony.java
@@ -3032,16 +3032,17 @@ protected void writeAttributes(FreeColXMLWriter xw) throws XMLStreamException {
             xw.writeAttribute(PRODUCTION_BONUS_TAG, productionBonus);
 
         } else {
-
             int uc = getApparentUnitCount();
-            if (uc <= 0) {
+            if (uc > 0) { // Valid if above zero
+                xw.writeAttribute(UNIT_COUNT_TAG, uc);
+            } else if (uc == 0) { // Zero is an error!  Find that bug
                 FreeCol.trace(logger, "Unit count fail: " + uc
-                    + " id=" + getId()
+                    + " id=" + getId() + " name=" + getName()
                     + " unitCount=" + getUnitCount()
+                    + " displayUnitCount=" + this.displayUnitCount
                     + " scope=" + xw.getWriteScope()
                     + "/" + xw.getClientPlayer());
-            }
-            xw.writeAttribute(UNIT_COUNT_TAG, uc);
+            } // else do nothing, negative means no value set
         }
     }
 

diff --git a/src/net/sf/freecol/common/model/Tile.java b/src/net/sf/freecol/common/model/Tile.java
@@ -1954,7 +1954,7 @@ public Tile getTileToCache() {
         Colony colony = getColony();
         if (colony != null) {
             tile.getColony()
-                .setDisplayUnitCount(Math.min(1, colony.getUnitCount()));
+                .setDisplayUnitCount(Math.max(1, colony.getUnitCount()));
         }
         return tile;
     }