From d76e70b1f73231701be4e9d6dadfa2abf84d5326 Mon Sep 17 00:00:00 2001
From: KennyTV <28825609+KennyTV@users.noreply.github.com>
Date: Sat, 27 Apr 2019 18:59:18 +0200
Subject: [PATCH] Don't cache Item

---
 .../bukkit/listeners/protocol1_9to1_8/HandItemCache.java        | 2 +-
 .../main/java/us/myles/ViaVersion/api/minecraft/item/Item.java  | 1 -
 .../sponge/listeners/protocol1_9to1_8/HandItemCache.java        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
index a59a5e34e..0cc55c169 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
@@ -35,7 +35,7 @@ public class HandItemCache extends BukkitRunnable {
     }
 
     public static Item convert(ItemStack itemInHand) {
-        if (itemInHand == null) return Item.EMPTY;
+        if (itemInHand == null) new Item((short) 0, (byte) 0, (short) 0, null);
         return new Item((short) itemInHand.getTypeId(), (byte) itemInHand.getAmount(), itemInHand.getDurability(), null);
     }
 }
diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
index c99a663ac..8a47bcaa5 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
@@ -11,7 +11,6 @@ import lombok.*;
 @ToString
 @EqualsAndHashCode
 public class Item {
-    public static final Item EMPTY = new Item((short) 0, (byte) 0, (short) 0, null);
     @SerializedName(value = "identifier", alternate = "id")
     private int identifier;
     private byte amount;
diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/listeners/protocol1_9to1_8/HandItemCache.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
index 0df3ae4ce..fa9833ed7 100644
--- a/sponge/src/main/java/us/myles/ViaVersion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
+++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/listeners/protocol1_9to1_8/HandItemCache.java
@@ -51,7 +51,7 @@ public class HandItemCache implements Runnable {
     }
 
     public static Item convert(ItemStack itemInHand) {
-        if (itemInHand == null) return Item.EMPTY;
+        if (itemInHand == null) return new Item((short) 0, (byte) 0, (short) 0, null);
         if (GET_DAMAGE == null) {
             try {
                 GET_DAMAGE = itemInHand.getClass().getDeclaredField("field_77991_e");