From 6199e1d8ce77a8519cd9fe7d3fa89ef766d90fa8 Mon Sep 17 00:00:00 2001
From: Myles <mylescomputer@gmail.com>
Date: Wed, 2 Mar 2016 10:09:04 +0000
Subject: [PATCH] Correct last commit to make it work.

---
 .../us/myles/ViaVersion/ViaVersionPlugin.java | 22 -------------------
 .../transformers/IncomingTransformer.java     |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
index 5e7a15594..20af1c3d3 100644
--- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
+++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
@@ -84,28 +84,6 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         }
     }
 
-    public static Entity getEntity(final UUID player, final int id) {
-        try {
-            return Bukkit.getScheduler().callSyncMethod(getPlugin(ViaVersionPlugin.class), new Callable<Entity>() {
-                @Override
-                public Entity call() throws Exception {
-                    Player p = Bukkit.getPlayer(player);
-                    if (p == null) return null;
-                    for (Entity e : p.getWorld().getEntities()) {
-                        if (e.getEntityId() == id) {
-                            return e;
-                        }
-                    }
-                    return null;
-                }
-            }).get(10, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            System.out.println("Error fetching entity ");
-            e.printStackTrace();
-            return null;
-        }
-    }
-
     public static ItemStack getHandItem(final ConnectionInfo info) {
         try {
             return Bukkit.getScheduler().callSyncMethod(getPlugin(ViaVersionPlugin.class), new Callable<ItemStack>() {
diff --git a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java
index 80c2d317f..26091fd9c 100644
--- a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java
+++ b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java
@@ -212,7 +212,7 @@ public class IncomingTransformer {
 	        output.writeLong(-1L);
 	        output.writeByte(255);
 	        // write item in hand
-	        ItemStack inHand = Core.getHandItem(info);
+	        ItemStack inHand = ViaVersionPlugin.getHandItem(info);
             Object item = null;
             try {
                 Method m = ReflectionUtil.obc("inventory.CraftItemStack").getDeclaredMethod("asNMSCopy", ItemStack.class);