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

simplified explosion stuff in multi-block implementation for fmp callbacks

Browse Source
This commit is contained in:
Florian Nücke 2014-03-02 18:35:35 +01:00
parent 61f744dcb9
commit e702d0bf63
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc/common/block/Delegate.scala
View File

@ -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 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 def isNormalCube(world: World, x: Int, y: Int, z: Int) = true

2
src/main/java/li/cil/oc/common/block/Delegator.scala
View File

@ -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) = 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 { 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) case _ => super.getExplosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ)
} }

2
src/main/java/li/cil/oc/common/block/RobotProxy.scala
View File

@ -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 override def isNormalCube(world: World, x: Int, y: Int, z: Int) = false