I'm actually going to die

Auxilor · Aug 7, 2021 · 2241a5c · 2241a5c
1 parent bbc38ae
commit 2241a5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...ore/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackUtils.java b/...ore/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackUtils.java
@@ -8,14 +8,15 @@
 import java.lang.reflect.Field;
 
 public class FastItemStackUtils {
-    private static final Field field;
+    private static final Field FIELD;
 
     public static net.minecraft.server.v1_16_R3.ItemStack getNMSStack(@NotNull final ItemStack itemStack) {
         if (!(itemStack instanceof CraftItemStack)) {
             return CraftItemStack.asNMSCopy(itemStack);
         } else {
             try {
-                return (net.minecraft.server.v1_16_R3.ItemStack) field.get(itemStack);
+                net.minecraft.server.v1_16_R3.ItemStack nms = (net.minecraft.server.v1_16_R3.ItemStack) FIELD.get(itemStack);
+                return nms == null ? CraftItemStack.asNMSCopy(itemStack) : nms;
             } catch (ReflectiveOperationException e) {
                 e.printStackTrace();
                 return null;
@@ -37,6 +38,6 @@ public static net.minecraft.server.v1_16_R3.ItemStack getNMSStack(@NotNull final
         assert temp != null;
         Validate.notNull(temp, "Error occurred in initialization!");
 
-        field = temp;
+        FIELD = temp;
     }
 }
diff --git a/...ore/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackUtils.java b/...ore/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackUtils.java
@@ -10,14 +10,15 @@
 
 @UtilityClass
 public class FastItemStackUtils {
-    private static final Field field;
+    private static final Field FIELD;
 
     public static net.minecraft.world.item.ItemStack getNMSStack(@NotNull final ItemStack itemStack) {
         if (!(itemStack instanceof CraftItemStack)) {
             return CraftItemStack.asNMSCopy(itemStack);
         } else {
             try {
-                return (net.minecraft.world.item.ItemStack) field.get(itemStack);
+                net.minecraft.world.item.ItemStack nms = (net.minecraft.world.item.ItemStack) FIELD.get(itemStack);
+                return nms == null ? CraftItemStack.asNMSCopy(itemStack) : nms;
             } catch (ReflectiveOperationException e) {
                 e.printStackTrace();
                 return null;
@@ -39,6 +40,6 @@ public static net.minecraft.world.item.ItemStack getNMSStack(@NotNull final Item
         assert temp != null;
         Validate.notNull(temp, "Error occurred in initialization!");
 
-        field = temp;
+        FIELD = temp;
     }
 }