Fixed NullPointerException (#967)

* add 1.20.4 support (#949) add 1.20.4 support * Fixed NullPointerException Fixed NullPointerException Error Log: https://pastebin.com/DCWeqQKQ --------- Co-authored-by: Andrei Dascălu <[email protected]>
andrei1058 · Feb 3, 2024 · 134a361 · 134a361
1 parent f4226f6
commit 134a361
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/...pport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java b/...pport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
@@ -74,6 +74,9 @@ public v1_12_R1(Plugin plugin, String name) {
     @Override
     public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) {
         net.minecraft.server.v1_12_R1.ItemStack i = CraftItemStack.asNMSCopy(itemStack);
+        if (i == null) {
+            return null;
+        }
         NBTTagCompound tag = i.getTag();
         return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null;
     }

diff --git a/...nsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java b/...nsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
@@ -441,6 +441,9 @@ public ItemStack setTag(ItemStack itemStack, String key, String value) {
     @Override
     public String getTag(ItemStack itemStack, String key) {
         net.minecraft.server.v1_8_R3.ItemStack i = CraftItemStack.asNMSCopy(itemStack);
+        if (i == null) {
+            return null;
+        }
         NBTTagCompound tag = i.getTag();
         return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null;
     }

diff --git a/...port_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java b/...port_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
@@ -90,6 +90,9 @@ public void registerCommand(String name, Command clasa) {
     @Override
     public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) {
         net.minecraft.server.v1_16_R3.ItemStack i = CraftItemStack.asNMSCopy(itemStack);
+        if (i == null) {
+            return null;
+        }
         NBTTagCompound tag = i.getTag();
         return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null;
     }

diff --git a/...port_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java b/...port_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
@@ -116,6 +116,9 @@ public void registerCommand(String name, Command clasa) {
     @Override
     public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) {
         ItemStack i = CraftItemStack.asNMSCopy(itemStack);
+        if (i == null) {
+            return null;
+        }
         NBTTagCompound tag = i.getTag();
         return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null;
     }

diff --git a/...port_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java b/...port_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
@@ -106,6 +106,9 @@ public void registerCommand(String name, Command clasa) {
     @Override
     public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) {
         ItemStack i = CraftItemStack.asNMSCopy(itemStack);
+        if (i == null) {
+            return null;
+        }
         NBTTagCompound tag = i.t();
         return tag == null ? null : tag.e(key) ? tag.l(key) : null;
     }