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

Handle disabled command blocks more gracefully in driver, closes #1575.

Browse Source
This commit is contained in:
Florian Nücke 2015-12-27 13:25:10 +01:00
parent 43d2fba5bf
commit 9b45cf894a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/integration/vanilla/DriverCommandBlock.scala
View File

@ -12,6 +12,7 @@ import li.cil.oc.util.ResultWrapper.result
import net.minecraft.block.Block
import net.minecraft.init.Blocks
import net.minecraft.item.ItemStack
import net.minecraft.server.MinecraftServer
import net.minecraft.tileentity.TileEntityCommandBlock
import net.minecraft.world.World
@ -41,9 +42,13 @@ object DriverCommandBlock extends DriverTileEntity {
@Callback(doc = "function():number -- Execute the currently set command. This has a slight delay to allow the command block to properly update.")
def executeCommand(context: Context, args: Arguments): Array[AnyRef] = {
context.pause(0.1)
val commandSender = tileEntity.func_145993_a
commandSender.func_145755_a(tileEntity.getWorldObj)
result(commandSender.func_145760_g, commandSender.func_145749_h.getUnformattedText)
if (!MinecraftServer.getServer.isCommandBlockEnabled) {
result(null, "command blocks are disabled")
} else {
val commandSender = tileEntity.func_145993_a
commandSender.func_145755_a(tileEntity.getWorldObj)
result(commandSender.func_145760_g, commandSender.func_145749_h.getUnformattedText)
}
}
}