Only extract villages on client side if the active.

Also put some code in to protect against ConcurrentModificationExceptions

diff --git a/java/com/irtimaled/bbor/client/ClientProxy.java b/java/com/irtimaled/bbor/client/ClientProxy.java
index f4d9f90df8a673ea4f929751d9b69727a3586d51..544b54cde8100a4c850c9d2ad183586baaa8d32e 100644 (file)
--- a/java/com/irtimaled/bbor/client/ClientProxy.java
+++ b/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -52,6 +52,13 @@ public class ClientProxy extends CommonProxy {
         }
     }
 
+    @Override
+    public void tick() {
+        if (this.active) {
+            super.tick();
+        }
+    }
+
     public void playerConnectedToServer(NetworkManager networkManager) {
         SocketAddress remoteAddress = networkManager.getRemoteAddress();
         if (remoteAddress instanceof InetSocketAddress) {

diff --git a/java/com/irtimaled/bbor/common/models/BoundingBoxVillage.java b/java/com/irtimaled/bbor/common/models/BoundingBoxVillage.java
index 95a8f4e05b47993d8822cdd7e1f0a69131c6bd97..427aa45d3b7c0d777057a89c23964610eb8623f6 100644 (file)
--- a/java/com/irtimaled/bbor/common/models/BoundingBoxVillage.java
+++ b/java/com/irtimaled/bbor/common/models/BoundingBoxVillage.java
@@ -6,8 +6,8 @@ import net.minecraft.village.Village;
 import net.minecraft.village.VillageDoorInfo;
 
 import java.awt.*;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import java.util.List;
 
 public class BoundingBoxVillage extends BoundingBox {
     private final BlockPos center;
@@ -57,9 +57,10 @@ public class BoundingBoxVillage extends BoundingBox {
 
     private static Set<BlockPos> getDoorsFromVillage(Village village) {
         Set<BlockPos> doors = new HashSet<>();
-        for (Object doorInfo : village.getVillageDoorInfoList()) {
-            VillageDoorInfo villageDoorInfo = (VillageDoorInfo) doorInfo;
-            doors.add(villageDoorInfo.getDoorBlockPos());
+        List<VillageDoorInfo> doorInfoList = village.getVillageDoorInfoList();
+        for (int i = 0; i < doorInfoList.size(); i++) {
+            VillageDoorInfo doorInfo = doorInfoList.get(i);
+            doors.add(doorInfo.getDoorBlockPos());
         }
         return doors;
     }