aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0798-Make-some-itemstacks-nonnull.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0798-Make-some-itemstacks-nonnull.patch')
-rw-r--r--patches/server/0798-Make-some-itemstacks-nonnull.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/0798-Make-some-itemstacks-nonnull.patch b/patches/server/0798-Make-some-itemstacks-nonnull.patch
new file mode 100644
index 0000000000..153d145fd3
--- /dev/null
+++ b/patches/server/0798-Make-some-itemstacks-nonnull.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Tue, 15 Mar 2022 01:38:15 -0700
+Subject: [PATCH] Make some itemstacks nonnull
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
+index f89a1b1c1902b16f6640c9a95f5b72351b60ceda..0c80dea986b0b63b2182c4ca0d23d6534f753cb0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
+@@ -155,13 +155,13 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
+ case OFF_HAND:
+ return this.getItemInOffHand();
+ case FEET:
+- return this.getBoots();
++ return java.util.Objects.requireNonNullElseGet(this.getBoots(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
+ case LEGS:
+- return this.getLeggings();
++ return java.util.Objects.requireNonNullElseGet(this.getLeggings(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
+ case CHEST:
+- return this.getChestplate();
++ return java.util.Objects.requireNonNullElseGet(this.getChestplate(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
+ case HEAD:
+- return this.getHelmet();
++ return java.util.Objects.requireNonNullElseGet(this.getHelmet(), () -> new ItemStack(org.bukkit.Material.AIR)); // Paper - make nonnull
+ default:
+ throw new IllegalArgumentException("Not implemented. This is a bug");
+ }