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

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9

Browse Source
This commit is contained in:
Florian Nücke 2017-02-14 22:36:54 +01:00
commit b035cf91b4
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/OpenComputers-JNLua.jar
View File

Binary file not shown.

BIN
libs/OpenComputers-LuaJ.jar
View File

Binary file not shown.

4
src/main/scala/li/cil/oc/common/entity/Drone.scala
View File

@ -466,7 +466,8 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
super.hitByEntity(entity) super.hitByEntity(entity)
} }
override def interactFirst(player: EntityPlayer) = { override def interactFirst(player: EntityPlayer): Boolean = {
if (isDead) return false
if (player.isSneaking) { if (player.isSneaking) {
if (Wrench.isWrench(player.getHeldItem)) { if (Wrench.isWrench(player.getHeldItem)) {
if(!world.isRemote) { if(!world.isRemote) {
@ -538,6 +539,7 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
} }
override def kill(): Unit = { override def kill(): Unit = {
if (isDead) return
super.kill() super.kill()
if (!world.isRemote) { if (!world.isRemote) {
val stack = api.Items.get(Constants.ItemName.Drone).createItemStack(1) val stack = api.Items.get(Constants.ItemName.Drone).createItemStack(1)