From 592bee78b85ed3977169d763f897417b2e08f7ac Mon Sep 17 00:00:00 2001
From: Tschipp <jonas.blank@hispeed.ch>
Date: Sat, 7 Oct 2017 18:19:21 +0200
Subject: [PATCH] 1.10 changes

---
 src/main/java/tschipp/carryon/common/event/ItemEvents.java    | 4 ++--
 .../carryon/network/client/CarrySlotPacketHandler.java        | 2 +-
 .../carryon/network/client/ScriptReloadPacketHandler.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/tschipp/carryon/common/event/ItemEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEvents.java
index 084dafe..735e461 100644
--- a/src/main/java/tschipp/carryon/common/event/ItemEvents.java
+++ b/src/main/java/tschipp/carryon/common/event/ItemEvents.java
@@ -103,7 +103,7 @@ public class ItemEvents
 			World world = player.getEntityWorld();
 
 			ItemStack carried = player.getHeldItemMainhand();
-			if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
+			if (carried != null && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
 			{
 				if (carried.getItem() == RegistrationHandler.itemTile)
 				{
@@ -139,7 +139,7 @@ public class ItemEvents
 			World world = player.getEntityWorld();
 
 			ItemStack carried = player.getHeldItemMainhand();
-			if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
+			if (carried != null && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
 			{
 				if (carried.getItem() == RegistrationHandler.itemTile)
 				{
diff --git a/src/main/java/tschipp/carryon/network/client/CarrySlotPacketHandler.java b/src/main/java/tschipp/carryon/network/client/CarrySlotPacketHandler.java
index 4c131de..54c9786 100644
--- a/src/main/java/tschipp/carryon/network/client/CarrySlotPacketHandler.java
+++ b/src/main/java/tschipp/carryon/network/client/CarrySlotPacketHandler.java
@@ -21,7 +21,7 @@ public class CarrySlotPacketHandler implements IMessageHandler<CarrySlotPacket,
 
 		mainThread.addScheduledTask(new Runnable()
 		{
-			World world = Minecraft.getMinecraft().world;
+			World world = Minecraft.getMinecraft().theWorld;
 
 			@Override
 			public void run()
diff --git a/src/main/java/tschipp/carryon/network/client/ScriptReloadPacketHandler.java b/src/main/java/tschipp/carryon/network/client/ScriptReloadPacketHandler.java
index 507e35e..05be652 100644
--- a/src/main/java/tschipp/carryon/network/client/ScriptReloadPacketHandler.java
+++ b/src/main/java/tschipp/carryon/network/client/ScriptReloadPacketHandler.java
@@ -18,7 +18,7 @@ public class ScriptReloadPacketHandler implements IMessageHandler<ScriptReloadPa
 
 		mainThread.addScheduledTask(new Runnable()
 		{
-			EntityPlayerSP player = Minecraft.getMinecraft().player;
+			EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
 
 			@Override
 			public void run()