From 3d61b3ce280cf1ee3e207d2eeb5c05638bef2440 Mon Sep 17 00:00:00 2001
From: AJ Ferguson <fergusonjva@gmail.com>
Date: Thu, 30 Jan 2020 23:15:18 -0900
Subject: [PATCH] Bump OpenNBT lib to 1.4-SNAPSHOT

This fixes the NPE when sending an ItemStack with a null NBT tag.
This also fixes some item movement bugs on pure vanilla servers.
---
 connector/pom.xml                                          | 2 +-
 .../translators/inventory/PlayerInventoryTranslator.java   | 4 ++--
 .../network/translators/inventory/action/ClickPlan.java    | 2 +-
 .../java/org/geysermc/connector/utils/InventoryUtils.java  | 7 -------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/connector/pom.xml b/connector/pom.xml
index 9de1e3e75..c61311590 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.github.steveice10</groupId>
             <artifactId>opennbt</artifactId>
-            <version>1.3-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/PlayerInventoryTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/PlayerInventoryTranslator.java
index acad709f5..31d898c29 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/PlayerInventoryTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/PlayerInventoryTranslator.java
@@ -182,7 +182,7 @@ public class PlayerInventoryTranslator extends InventoryTranslator {
                         } else {
                             javaItem = TranslatorsInit.getItemTranslator().translateToJava(action.getToItem());
                         }
-                        ClientCreativeInventoryActionPacket creativePacket = new ClientCreativeInventoryActionPacket(javaSlot, InventoryUtils.fixStack(javaItem));
+                        ClientCreativeInventoryActionPacket creativePacket = new ClientCreativeInventoryActionPacket(javaSlot, javaItem);
                         session.getDownstream().getSession().send(creativePacket);
                         inventory.setItem(javaSlot, javaItem);
                         break;
@@ -195,7 +195,7 @@ public class PlayerInventoryTranslator extends InventoryTranslator {
                         if (action.getSource().getType() == InventorySource.Type.WORLD_INTERACTION
                                 && action.getSource().getFlag() == InventorySource.Flag.DROP_ITEM) {
                             javaItem = TranslatorsInit.getItemTranslator().translateToJava(action.getToItem());
-                            ClientCreativeInventoryActionPacket creativeDropPacket = new ClientCreativeInventoryActionPacket(-1, InventoryUtils.fixStack(javaItem));
+                            ClientCreativeInventoryActionPacket creativeDropPacket = new ClientCreativeInventoryActionPacket(-1, javaItem);
                             session.getDownstream().getSession().send(creativeDropPacket);
                         }
                         break;
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/ClickPlan.java b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/ClickPlan.java
index 3abdd2843..cdc42f961 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/ClickPlan.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/ClickPlan.java
@@ -61,7 +61,7 @@ class ClickPlan {
                 refresh = true;
 
             ClientWindowActionPacket clickPacket = new ClientWindowActionPacket(inventory.getId(),
-                    actionId, action.slot, !planIter.hasNext() && refresh ? InventoryUtils.REFRESH_ITEM : InventoryUtils.fixStack(clickedItem),
+                    actionId, action.slot, !planIter.hasNext() && refresh ? InventoryUtils.REFRESH_ITEM : clickedItem,
                     WindowAction.CLICK_ITEM, action.click.actionParam);
 
             if (translator.getSlotType(action.slot) == SlotType.OUTPUT) {
diff --git a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java b/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
index f55f28bbd..0fb9e0fc1 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
@@ -87,13 +87,6 @@ public class InventoryUtils {
         session.getUpstream().sendPacket(cursorPacket);
     }
 
-    //NPE if compound tag is null
-    public static ItemStack fixStack(ItemStack stack) {
-        if (stack == null || stack.getId() == 0)
-            return null;
-        return new ItemStack(stack.getId(), stack.getAmount(), stack.getNbt() == null ? new CompoundTag("") : stack.getNbt());
-    }
-
     public static boolean canStack(ItemStack item1, ItemStack item2) {
         if (item1 == null || item2 == null)
             return false;