From 008a75c8fcc4f9a7383b17c91b8105d092742646 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Mon, 23 Sep 2013 21:30:22 +1000 Subject: [PATCH] Add some better validation functions to TileMultipart for mass tile movement. --- .../multipart/MultipartGenerator.scala | 4 ++-- codechicken/multipart/TileMultipart.scala | 21 ++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/codechicken/multipart/MultipartGenerator.scala b/codechicken/multipart/MultipartGenerator.scala index 47b85d2..cd994b6 100644 --- a/codechicken/multipart/MultipartGenerator.scala +++ b/codechicken/multipart/MultipartGenerator.scala @@ -76,7 +76,7 @@ object MultipartGenerator if(!partTraits.isEmpty) { ntile = factory.generateTile(partTraits++tileTraits, world.isRemote) - tile.prepareSwap() + tile.setValid(false) world.setBlockTileEntity(pos.x, pos.y, pos.z, ntile) ntile.from(tile) } @@ -118,7 +118,7 @@ object MultipartGenerator if(!traitsForPart(part, client).forall(testSet(_))) { val ntile = factory.generateTile(testSet.toSeq, client) - tile.prepareSwap() + tile.setValid(false) 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 b4b8f20..964e81b 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -110,16 +110,23 @@ class TileMultipart extends TileEntity { val wasInvalid = isInvalid super.validate() - if(wasInvalid) { - TileMultipart.startOperation(this) - partList.foreach(_.onMoved()) - TileMultipart.finishOperation(this) - } + if(wasInvalid) + onMoved() } - private[multipart] def prepareSwap() + final def setValid(b:Boolean) { - super.invalidate() + if(b) + super.validate() + else + super.invalidate() + } + + def onMoved() + { + TileMultipart.startOperation(this) + partList.foreach(_.onMoved()) + TileMultipart.finishOperation(this) } override def invalidate()