- Sometimes, in combination with some mods, it fails to correctly sto…

…p using Iterator when accessing the list after ticking.
wildex999 · Feb 20, 2016 · 85edf62 · 85edf62
1 parent 94ac938
commit 85edf62
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.2.0-dev4"
+version = "0.2.0-dev5"
 String fullversion = "1.7.10-10.13.2.1291"
 group= "com.wildex999.tickdynamic" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tickdynamic-kcauldron" + fullversion

diff --git a/src/main/java/com/wildex999/tickdynamic/TickDynamicMod.java b/src/main/java/com/wildex999/tickdynamic/TickDynamicMod.java
@@ -75,7 +75,7 @@
 public class TickDynamicMod extends DummyModContainer
 {
     public static final String MODID = "tickDynamic";
-    public static final String VERSION = "0.2.0-dev4";
+    public static final String VERSION = "0.2.0-dev5";
     public static boolean debug = false;
     public static boolean debugGroups = false;
     public static boolean debugTimer = false;

diff --git a/src/main/java/com/wildex999/tickdynamic/WorldEventHandler.java b/src/main/java/com/wildex999/tickdynamic/WorldEventHandler.java
@@ -39,7 +39,7 @@ public WorldEventHandler(TickDynamicMod mod) {
 		tileListManager = new HashMap<World, ListManager>();
 	}
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void worldTickEvent(WorldTickEvent event) {
 		Profiler profiler = event.world.theProfiler;
 		if(!(profiler instanceof CustomProfiler))
@@ -50,6 +50,16 @@ public void worldTickEvent(WorldTickEvent event) {
     		customProfiler.setStage(CustomProfiler.Stage.BeforeLoop);
     	}
     	else {
+			//Ensure Entity ticking stops
+			List entityList = event.world.loadedEntityList;
+			if(entityList != null && entityList instanceof ListManagerEntities) {
+				((ListManagerEntities)event.world.loadedEntityList).stopUpdate();
+			}
+			//Ensure TileEntity ticking stops
+			List tileList = event.world.loadedEntityList;
+			if(tileList != null && tileList instanceof ListManagerTileEntities) {
+				((ListManagerTileEntities)event.world.loadedTileEntityList).stopUpdate();
+			}
     		customProfiler.setStage(CustomProfiler.Stage.None);
     	}
     }

diff --git a/src/main/java/com/wildex999/tickdynamic/listinject/ListManagerTileEntities.java b/src/main/java/com/wildex999/tickdynamic/listinject/ListManagerTileEntities.java
@@ -1,6 +1,7 @@
 package com.wildex999.tickdynamic.listinject;
 
 import java.util.Iterator;
+import java.util.List;
 
 import com.wildex999.tickdynamic.TickDynamicMod;
 
@@ -34,6 +35,12 @@ public int size() {
 			return super.size();
 
 		if(!updateStarted) {
+			//Ensure Entity ticking stops
+			List entityList = this.world.loadedEntityList;
+			if(entityList != null && entityList instanceof ListManagerEntities) {
+				((ListManagerEntities)this.world.loadedEntityList).stopUpdate();
+			}
+
 			updateStarted = true;
 			entityIterator = new EntityIteratorTimed(this, this.getAge());
 		}