AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Should fix #625.

Browse Source
This commit is contained in:
Florian Nücke 2014-10-25 19:46:23 +02:00
parent aa55f1fc1d
commit 56c008fa59
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
View File

@ -203,7 +203,8 @@ class SimpleBlock(material: Material = Material.iron) extends Block(material) {
bounds.maxZ.toFloat)
}
final override def collisionRayTrace(world: World, x: Int, y: Int, z: Int, origin: Vec3, direction: Vec3) =
// NOTE: must not be final for immibis microblocks to work.
override def collisionRayTrace(world: World, x: Int, y: Int, z: Int, origin: Vec3, direction: Vec3) =
this.synchronized(intersect(world, x, y, z, origin, direction))
protected def intersect(world: World, x: Int, y: Int, z: Int, origin: Vec3, direction: Vec3) =
@ -241,7 +242,8 @@ class SimpleBlock(material: Material = Material.iron) extends Block(material) {
// ----------------------------------------------------------------------- //
final override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, side: Int, hitX: Float, hitY: Float, hitZ: Float): Boolean =
// NOTE: must not be final for immibis microblocks to work.
override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, side: Int, hitX: Float, hitY: Float, hitZ: Float): Boolean =
world.getTileEntity(x, y, z) match {
case colored: Colored if Color.isDye(player.getHeldItem) =>
colored.color = Color.dyeColor(player.getHeldItem)