Ensure TE/E not in previous tick region if multiple add( calls.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jun 18, 2013 · b42905a · b42905a
1 parent 7cec5c5
commit b42905a
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/common/nallar/tickthreading/minecraft/TickManager.java b/src/common/nallar/tickthreading/minecraft/TickManager.java
@@ -147,7 +147,14 @@ private void processChanges() {
 	}
 
 	public boolean add(TileEntity tileEntity, boolean newEntity) {
+		TileEntityTickRegion lastTickRegion = tileEntity.tickRegion;
 		TileEntityTickRegion tileEntityTickRegion = getOrCreateRegion(tileEntity);
+		if (lastTickRegion != null) {
+			if (lastTickRegion == tileEntityTickRegion) {
+				return false;
+			}
+			lastTickRegion.remove(tileEntity);
+		}
 		if (tileEntityTickRegion.add(tileEntity)) {
 			tileEntity.tickRegion = tileEntityTickRegion;
 			if (newEntity) {
@@ -161,7 +168,14 @@ public boolean add(TileEntity tileEntity, boolean newEntity) {
 	}
 
 	public boolean add(Entity entity, boolean newEntity) {
+		EntityTickRegion lastTickRegion = entity.tickRegion;
 		EntityTickRegion entityTickRegion = getOrCreateRegion(entity);
+		if (lastTickRegion != null) {
+			if (lastTickRegion == entityTickRegion) {
+				return false;
+			}
+			lastTickRegion.remove(entity);
+		}
 		if (entityTickRegion.add(entity)) {
 			entity.tickRegion = entityTickRegion;
 			if (newEntity) {
@@ -232,8 +246,8 @@ public void batchRemoveTileEntities(HashSet<TileEntity> tileEntities) {
 		for (TileEntity tileEntity : tileEntities) {
 			TileEntityTickRegion tickRegion = tileEntity.tickRegion;
 			if (tickRegion != null) {
-				tickRegion.remove(tileEntity);
 				tileEntity.tickRegion = null;
+				tickRegion.remove(tileEntity);
 				tileEntity.onChunkUnload();
 			}
 			unlock(tileEntity);