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

Merge pull request #2060 from joserobjr/patch-1

Browse Source 
Check if the world is remote before killing the drone
This commit is contained in:
Florian "Sangar" Nücke 2016-09-18 20:16:45 +02:00 committed by GitHub
commit fc56f31116
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,8 +467,10 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
override def interactFirst(player: EntityPlayer) = { override def interactFirst(player: EntityPlayer) = {
if (player.isSneaking) { if (player.isSneaking) {
if (Wrench.isWrench(player.getHeldItem)) { if (Wrench.isWrench(player.getHeldItem)) {
if(!world.isRemote) {
kill() kill()
} }
}
else if (!world.isRemote && !machine.isRunning) { else if (!world.isRemote && !machine.isRunning) {
preparePowerUp() preparePowerUp()
start() start()