Fix village colors changing on reload local game

irtimaled · Dec 30, 2017 · 08ce096 · 08ce096
1 parent e744fca
commit 08ce096
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/java/com/irtimaled/bbor/client/ClientProxy.java b/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -62,9 +62,11 @@ public void playerConnectedToServer(NetworkManager networkManager) {
 
     public void playerDisconnectedFromServer() {
         active = false;
+        villageProcessors.forEach(VillageProcessor::close);
+        villageProcessors.clear();
+
         if (ConfigManager.keepCacheBetweenSessions.getBoolean()) return;
         VillageColorCache.clear();
         dimensionCache.clear();
-        villageProcessors.forEach(VillageProcessor::clear);
     }
 }
diff --git a/java/com/irtimaled/bbor/common/VillageColorCache.java b/java/com/irtimaled/bbor/common/VillageColorCache.java
@@ -13,8 +13,7 @@ public static void clear() {
     }
 
     private static Color getNextColor() {
-        ++colorIndex;
-        switch (colorIndex % 6) {
+        switch (++colorIndex % 6) {
             case 0:
                 return Color.RED;
             case 1:

diff --git a/java/com/irtimaled/bbor/common/VillageProcessor.java b/java/com/irtimaled/bbor/common/VillageProcessor.java
@@ -11,11 +11,12 @@
 import java.util.Map;
 
 public class VillageProcessor {
-    private final World world;
-    private final DimensionType dimensionType;
-    private final IVillageEventHandler eventHandler;
+    private World world;
+    private DimensionType dimensionType;
+    private IVillageEventHandler eventHandler;
     private BoundingBoxCache boundingBoxCache;
     private Map<Integer, BoundingBoxVillage> villageCache = new HashMap<>();
+    private boolean closed = false;
 
     VillageProcessor(World world, DimensionType dimensionType, IVillageEventHandler eventHandler, BoundingBoxCache boundingBoxCache) {
         this.world = world;
@@ -25,6 +26,8 @@ public class VillageProcessor {
     }
 
     synchronized void process() {
+        if (closed) return;
+
         Map<Integer, BoundingBoxVillage> oldVillages = new HashMap<>(villageCache);
         Map<Integer, BoundingBoxVillage> newVillages = new HashMap<>();
         VillageCollection villageCollection = world.getVillageCollection();
@@ -54,7 +57,11 @@ synchronized void process() {
         villageCache = newVillages;
     }
 
-    public void clear() {
+    public void close() {
+        closed = true;
+        world = null;
+        eventHandler = null;
+        boundingBoxCache = null;
         villageCache.clear();
     }
 }