From e8faf698b3b06eaad3341cf9402bdd5757cdcde5 Mon Sep 17 00:00:00 2001
From: payonel <payonel@hotmail.com>
Date: Thu, 8 Mar 2018 23:34:43 -0800
Subject: [PATCH] merge and compile fixes

---
 src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala | 1 +
 src/main/scala/li/cil/oc/server/agent/Player.scala          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
index 1269d8aa2..6925b2b64 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
@@ -6,6 +6,7 @@ import li.cil.oc.api.machine.Arguments
 import li.cil.oc.api.machine.Callback
 import li.cil.oc.api.machine.Context
 import li.cil.oc.api.network._
+import li.cil.oc.server.{PacketSender => ServerPacketSender}
 import net.minecraftforge.fml.relauncher.Side
 import net.minecraftforge.fml.relauncher.SideOnly
 
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 fe555e18b..eae55c79e 100644
--- a/src/main/scala/li/cil/oc/server/agent/Player.scala
+++ b/src/main/scala/li/cil/oc/server/agent/Player.scala
@@ -123,6 +123,7 @@ object Player {
     for (i <- 0 until size) {
       setCopy(player.agent.mainInventory, i, player.inventory.mainInventory(i))
     }
+    setCopy(player.agent.equipmentInventory, 0, player.inventory.offHandInventory(0))
   }
 }