mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-12 08:50:04 -04:00
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8
Conflicts: src/main/scala/li/cil/oc/common/block/Print.scala
This commit is contained in:
commit
812ee34d8f
@ -10,6 +10,7 @@ import li.cil.oc.common.tileentity
|
||||
import li.cil.oc.integration.util.NEI
|
||||
import li.cil.oc.util.ExtendedAABB
|
||||
import li.cil.oc.util.ExtendedAABB._
|
||||
import net.minecraft.block.Block
|
||||
import li.cil.oc.util.InventoryUtils
|
||||
import net.minecraft.block.properties.IProperty
|
||||
import net.minecraft.block.state.IBlockState
|
||||
@ -230,4 +231,16 @@ class Print(protected implicit val tileTag: ClassTag[tileentity.Print]) extends
|
||||
InventoryUtils.spawnStackInWorld(tileEntity.position, tileEntity.data.createItemStack())
|
||||
}
|
||||
}
|
||||
|
||||
override def breakBlock(world: World, pos: BlockPos, state: IBlockState): Unit = {
|
||||
world.getTileEntity(pos) match {
|
||||
case print: tileentity.Print if print.data.emitRedstone(print.state) =>
|
||||
world.notifyNeighborsOfStateChange(pos, this)
|
||||
for (side <- EnumFacing.values) {
|
||||
world.notifyNeighborsOfStateChange(pos.offset(side), this)
|
||||
}
|
||||
case _ =>
|
||||
}
|
||||
super.breakBlock(world, pos, state)
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user