diff --git a/codechicken/multipart/MultipartGenerator.scala b/codechicken/multipart/MultipartGenerator.scala index 7d9c20a..83f9f0b 100644 --- a/codechicken/multipart/MultipartGenerator.scala +++ b/codechicken/multipart/MultipartGenerator.scala @@ -77,6 +77,7 @@ object MultipartGenerator if(!partTraits.isEmpty) { ntile = factory.generateTile(partTraits++tileTraits, world.isRemote) + tile.prepareSwap() world.setBlockTileEntity(pos.x, pos.y, pos.z, ntile) ntile.from(tile) } @@ -119,6 +120,7 @@ object MultipartGenerator if(!traitsForPart(part, client).forall(testSet(_))) { val ntile = factory.generateTile(testSet.toSeq, client) + tile.prepareSwap() tile.worldObj.setBlockTileEntity(tile.xCoord, tile.yCoord, tile.zCoord, ntile) ntile.from(tile) return ntile diff --git a/codechicken/multipart/TileMultipart.scala b/codechicken/multipart/TileMultipart.scala index 701d46f..f8a75dc 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -65,10 +65,11 @@ class TileMultipart extends TileEntity def loadFrom(that:TileMultipart) { partList.foreach(_.bind(this)) - if(!isInvalid) - partList.foreach(_.onWorldJoin()) if(doesTick) + { + doesTick = false setTicking(true) + } } /** @@ -109,11 +110,19 @@ class TileMultipart extends TileEntity partList.foreach(_.onMoved()) } - override def invalidate() + private[multipart] def prepareSwap() { super.invalidate() - if(worldObj != null) - partList.foreach(_.onWorldSeparate()) + } + + override def invalidate() + { + if(!isInvalid) + { + super.invalidate() + if(worldObj != null) + partList.foreach(_.onWorldSeparate()) + } } /**