Must untranslate side to derive property name.

vassalengine · Sep 21, 2023 · fa84c01 · fa84c01
1 parent 5a515e3
commit fa84c01
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java b/vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
@@ -521,13 +521,12 @@ public Component getControls() {
       alreadyTaken.add(p.getLocalizedSide());
     }
 
-    // Scan VassalHideSide_<side> properties for module-controlled exclusions
+    // Scan module VassalHideSide_<side> properties to exclude side when true
+    // The properties are named for untranslated sides!
     for (int i = 0; i < availableSides.size(); i++) { // search of sides
-      if (Boolean.valueOf((String) GameModule.getGameModule().getProperty("VassalHideSide_" + availableSides.get(i)))) {
-        String hideSide = translateSide(availableSides.get(i));
-        if (!alreadyTaken.contains(hideSide)) {
-          alreadyTaken.add(hideSide);
-        }
+      final String s = availableSides.get(i);
+      if (Boolean.valueOf((String) GameModule.getGameModule().getProperty("VassalHideSide_" + untranslateSide(s))) && !alreadyTaken.contains(s)) {
+          alreadyTaken.add(s);
       }
     }
 
@@ -845,13 +844,12 @@ protected String promptForSide(String newSide) {
         availableSides.clear();
         availableSides.addAll(sides);
 
-        // Scan VassalHideSide_<side> properties for module-controlled exclusions (when true)
+        // Scan module VassalHideSide_<side> properties to exclude side when true
+        // The properties are named for untranslated sides!
         for (int i = 0; i < availableSides.size(); i++) { // search of sides
-          if (Boolean.valueOf((String) GameModule.getGameModule().getProperty("VassalHideSide_" + availableSides.get(i)))) {
-            String hideSide = translateSide(availableSides.get(i));
-            if (!alreadyTaken.contains(hideSide)) {
-              alreadyTaken.add(hideSide);
-            }
+          final String s = availableSides.get(i);
+          if (Boolean.valueOf((String) GameModule.getGameModule().getProperty("VassalHideSide_" + untranslateSide(s))) && !alreadyTaken.contains(s)) {
+            alreadyTaken.add(s);
           }
         }
       }