From 36068e38ea2cb2b9b4017f65d3c7751af65094dd Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Thu, 29 Aug 2013 00:04:42 +1000 Subject: [PATCH] Allow parts to destroy themselves on world load --- codechicken/multipart/TickScheduler.scala | 3 ++- codechicken/multipart/TileMultipart.scala | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/codechicken/multipart/TickScheduler.scala b/codechicken/multipart/TickScheduler.scala index 123b7b4..5eafb67 100644 --- a/codechicken/multipart/TickScheduler.scala +++ b/codechicken/multipart/TickScheduler.scala @@ -20,6 +20,7 @@ import net.minecraft.nbt.CompressedStreamTools import java.io.DataInputStream import java.io.FileInputStream import net.minecraft.world.storage.SaveHandler +import java.util.ArrayList /** * Used for scheduling delayed callbacks to parts. @@ -227,7 +228,7 @@ object TickScheduler extends WorldExtensionInstantiator override def load() { - val it = chunk.chunkTileEntityMap.values.iterator + val it = new ArrayList(chunk.chunkTileEntityMap.values).iterator while(it.hasNext) { val t = it.next diff --git a/codechicken/multipart/TileMultipart.scala b/codechicken/multipart/TileMultipart.scala index ae784da..701d46f 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -96,7 +96,9 @@ class TileMultipart extends TileEntity def onChunkLoad() { + TileMultipart.startOperation(this) partList.foreach(_.onChunkLoad()) + TileMultipart.finishOperation(this) } override def validate()