From a302ed21c960aaec8342c29ecc0bfdc4155d062c Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Mon, 24 Jun 2013 13:21:44 +1000 Subject: [PATCH] Moved TFacePart to a more consistent location --- codechicken/multipart/TFacePart.scala | 6 ++++++ codechicken/multipart/TMultiPart.scala | 5 ----- codechicken/multipart/TileMultipart.scala | 7 +++++-- 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 codechicken/multipart/TFacePart.scala diff --git a/codechicken/multipart/TFacePart.scala b/codechicken/multipart/TFacePart.scala new file mode 100644 index 0000000..f547b19 --- /dev/null +++ b/codechicken/multipart/TFacePart.scala @@ -0,0 +1,6 @@ +package codechicken.multipart + +trait TFacePart extends TMultiPart +{ + def solid(side:Int):Boolean = true +} \ No newline at end of file diff --git a/codechicken/multipart/TMultiPart.scala b/codechicken/multipart/TMultiPart.scala index 5b81337..af52c42 100644 --- a/codechicken/multipart/TMultiPart.scala +++ b/codechicken/multipart/TMultiPart.scala @@ -93,9 +93,4 @@ abstract class TMultiPart def sendDescUpdate() = writeDesc(tile.getWriteStream(this)) def scheduleTick(ticks:Int) = TickScheduler.scheduleTick(this, ticks) -} - -trait TFacePart extends TMultiPart -{ - def solid(side:Int):Boolean = true } \ No newline at end of file diff --git a/codechicken/multipart/TileMultipart.scala b/codechicken/multipart/TileMultipart.scala index 6ebc735..51863c7 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -122,8 +122,11 @@ trait TileMultipart extends TileEntity def isSolid(side:Int):Boolean = { - val part = partMap(PartMap.face(side).i) - if(part != null) part.asInstanceOf[TFacePart].solid(side) else false + val part = partMap(side) + if(part != null) + return part.asInstanceOf[TFacePart].solid(side) + + return false } private def setTicking(tick:Boolean)