From 648cdf78aa64fe44c70f4714fcd8391d6946ba7a Mon Sep 17 00:00:00 2001
From: payonel <payonel@hotmail.com>
Date: Tue, 20 Mar 2018 12:34:32 -0700
Subject: [PATCH] use ItemStack.EMPTY since 1.11 and not nulls

robot.use() was using a null pointer when not holding any item

closes #2786
---
 src/main/scala/li/cil/oc/server/agent/Player.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/li/cil/oc/server/agent/Player.scala b/src/main/scala/li/cil/oc/server/agent/Player.scala
index 9ad47eaca..ca66224fb 100644
--- a/src/main/scala/li/cil/oc/server/agent/Player.scala
+++ b/src/main/scala/li/cil/oc/server/agent/Player.scala
@@ -495,7 +495,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
   private def callUsingItemInSlot[T](inventory: IInventory, slot: Int, f: (ItemStack) => T, repair: Boolean = true) = {
     val itemsBefore = adjacentItems
     val stack = inventory.getStackInSlot(slot)
-    val oldStack = if (!stack.isEmpty) stack.copy() else null
+    val oldStack = stack.copy()
     this.inventory.currentItem = if (inventory == agent.mainInventory) slot else ~slot
     this.offHand = (inventory, slot)
     try {