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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-06-15 20:08:56 +02:00
commit 965aafacbb
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/main/resources/assets/opencomputers/lib/native.32.dll
View File

Binary file not shown.

BIN
src/main/resources/assets/opencomputers/lib/native.64.dll
View File

Binary file not shown.

9
src/main/scala/li/cil/oc/common/block/Case.scala
View File

@ -96,6 +96,15 @@ abstract class Case(val parent: SimpleDelegator) extends RedstoneAware with Simp
}
true
}
else if (player.getCurrentEquippedItem == null) {
if (!world.isRemote) {
world.getBlockTileEntity(x, y, z) match {
case computer: tileentity.Case if !computer.isRunning => computer.start()
case _ =>
}
}
true
}
else false
}

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

@ -148,6 +148,15 @@ class RobotProxy(val parent: SpecialDelegator) extends RedstoneAware with Specia
}
true
}
else if (player.getCurrentEquippedItem == null) {
if (!world.isRemote) {
world.getBlockTileEntity(x, y, z) match {
case proxy: tileentity.RobotProxy if !proxy.isRunning => proxy.start()
case _ =>
}
}
true
}
else false
}