From e702d0bf63e15b14d002572994b9b32d4724cb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 2 Mar 2014 18:35:35 +0100 Subject: [PATCH] simplified explosion stuff in multi-block implementation for fmp callbacks --- src/main/java/li/cil/oc/common/block/Delegate.scala | 2 +- src/main/java/li/cil/oc/common/block/Delegator.scala | 2 +- src/main/java/li/cil/oc/common/block/RobotProxy.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/li/cil/oc/common/block/Delegate.scala b/src/main/java/li/cil/oc/common/block/Delegate.scala index d1eb0969d..5c68c87bc 100644 --- a/src/main/java/li/cil/oc/common/block/Delegate.scala +++ b/src/main/java/li/cil/oc/common/block/Delegate.scala @@ -35,7 +35,7 @@ trait Delegate { def drops(world: World, x: Int, y: Int, z: Int, fortune: Int): Option[java.util.ArrayList[ItemStack]] = None - def explosionResistance(entity: Entity, world: World, x: Int, y: Int, z: Int, explosionX: Double, explosionY: Double, explosionZ: Double): Float = parent.getExplosionResistance(entity) + def explosionResistance(entity: Entity): Float = parent.getExplosionResistance(entity) def isNormalCube(world: World, x: Int, y: Int, z: Int) = true diff --git a/src/main/java/li/cil/oc/common/block/Delegator.scala b/src/main/java/li/cil/oc/common/block/Delegator.scala index 511ae7a38..b3f655635 100644 --- a/src/main/java/li/cil/oc/common/block/Delegator.scala +++ b/src/main/java/li/cil/oc/common/block/Delegator.scala @@ -136,7 +136,7 @@ class Delegator[Child <: Delegate](id: Int) extends Block(id, Material.iron) { override def getExplosionResistance(entity: Entity, world: World, x: Int, y: Int, z: Int, explosionX: Double, explosionY: Double, explosionZ: Double) = subBlock(world, x, y, z) match { - case Some(subBlock) => subBlock.explosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ) + case Some(subBlock) => subBlock.explosionResistance(entity) case _ => super.getExplosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ) } diff --git a/src/main/java/li/cil/oc/common/block/RobotProxy.scala b/src/main/java/li/cil/oc/common/block/RobotProxy.scala index e901aa99d..fd1eefd42 100644 --- a/src/main/java/li/cil/oc/common/block/RobotProxy.scala +++ b/src/main/java/li/cil/oc/common/block/RobotProxy.scala @@ -71,7 +71,7 @@ class RobotProxy(val parent: SpecialDelegator) extends RedstoneAware with Specia // ----------------------------------------------------------------------- // - override def explosionResistance(entity: Entity, world: World, x: Int, y: Int, z: Int, explosionX: Double, explosionY: Double, explosionZ: Double) = 10f + override def explosionResistance(entity: Entity) = 10f override def isNormalCube(world: World, x: Int, y: Int, z: Int) = false