fixed iterator bug

CRModders · Jun 10, 2024 · 4196cf5 · 4196cf5
1 parent a7c9ce6
commit 4196cf5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Mod Properties
 id = flux-entities
-version = 1.2.1
+version = 1.2.2
 description = Flux Entities
 
 group = dev.crmodders

diff --git a/src/main/java/dev/crmodders/flux/entities/mixins/ChunkMixin.java b/src/main/java/dev/crmodders/flux/entities/mixins/ChunkMixin.java
@@ -49,21 +49,25 @@ public abstract class ChunkMixin implements ITickable, IRenderable {
     @Override
     public void onTick(float tps) {
         if(blockEntities != null)
-            blockEntities.forEach(entity -> {
-                if(entity instanceof ITickable tickable) {
-                    tickable.onTick(tps);
-                }
-            });
+            synchronized (blockEntities) {
+                blockEntities.forEach(entity -> {
+                    if(entity instanceof ITickable tickable) {
+                        tickable.onTick(tps);
+                    }
+                });
+            }
     }
 
     @Override
     public void onRender(Camera camera, float dt) {
         if(blockEntities != null)
-            blockEntities.forEach(entity -> {
-                if(entity instanceof IRenderable renderable) {
-                    renderable.onRender(camera, dt);
-                }
-            });
+            synchronized (blockEntities) {
+                blockEntities.forEach(entity -> {
+                    if(entity instanceof IRenderable renderable) {
+                        renderable.onRender(camera, dt);
+                    }
+                });
+            }
     }
 
     @Inject(method = "setBlockEntity", at= @At(value = "INVOKE", target = "Lfinalforeach/cosmicreach/blockentities/BlockEntity;onRemove()V", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD)

diff --git a/src/main/java/dev/crmodders/flux/entities/mixins/ZoneMixin.java b/src/main/java/dev/crmodders/flux/entities/mixins/ZoneMixin.java
@@ -20,19 +20,23 @@ public class ZoneMixin implements IRenderable {
 
     @Inject(method = "runScheduledTriggers", at = @At("HEAD"))
     private void zoneUpdate(CallbackInfo ci) {
-        chunks.forEach(chunk -> {
-            if(chunk instanceof ITickable tickable) {
-                tickable.onTick(1f / 20f); // TODO get tps here
-            }
-        });
+        synchronized (chunks) {
+            chunks.forEach(chunk -> {
+                if (chunk instanceof ITickable tickable) {
+                    tickable.onTick(1f / 20f); // TODO get tps here
+                }
+            });
+        }
     }
 
     @Override
     public void onRender(Camera camera, float dt) {
-        chunks.forEach(chunk -> {
-            if(chunk instanceof IRenderable renderable) {
-                renderable.onRender(camera, dt);
-            }
-        });
+        synchronized (chunks) {
+            chunks.forEach(chunk -> {
+                if(chunk instanceof IRenderable renderable) {
+                    renderable.onRender(camera, dt);
+                }
+            });
+        }
     }
 }