diff --git a/src/main/scala/codechicken/multipart/MultipartHelper.scala b/src/main/scala/codechicken/multipart/MultipartHelper.scala index 6b85dc1..3d2d0e7 100644 --- a/src/main/scala/codechicken/multipart/MultipartHelper.scala +++ b/src/main/scala/codechicken/multipart/MultipartHelper.scala @@ -41,7 +41,6 @@ object MultipartHelper { if (!tag.getString("id").equals("savedMultipart")) return null - MultipartSaveLoad.loadingWorld = world return TileMultipart.createFromNBT(tag) } diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala index 5fa299f..71eee74 100644 --- a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala +++ b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala @@ -7,16 +7,13 @@ import net.minecraft.world.chunk.Chunk import net.minecraft.world.ChunkPosition import codechicken.multipart.{MultipartHelper, TileMultipart} import codechicken.lib.asm.ObfMapping -import net.minecraft.world.World import scala.collection.mutable import codechicken.multipart.MultipartHelper.IPartTileConverter import scala.collection.JavaConversions._ -/** Hack due to lack of TileEntityLoadEvent in forge - */ +/** Hack due to lack of TileEntityLoadEvent in forge */ object MultipartSaveLoad { val converters = mutable.MutableList[IPartTileConverter[_]]() - var loadingWorld: World = _ class TileNBTContainer extends TileEntity { var tag: NBTTagCompound = _ @@ -59,7 +56,6 @@ object MultipartSaveLoad { } def loadTiles(chunk: Chunk) { - loadingWorld = chunk.worldObj val iterator = chunk.chunkTileEntityMap .asInstanceOf[Map[ChunkPosition, TileEntity]] .entrySet