From 29350674b31d378e9c16a14443e73b9de6b6738b Mon Sep 17 00:00:00 2001 From: SplotyCode <31861387+SplotyCode@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:15:20 +0200 Subject: [PATCH] Fix null item in sendEquipmentChange (#9869) --- ...stack-for-Player-sendEquipmentChange.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch new file mode 100644 index 0000000000..14fe4b5636 --- /dev/null +++ b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: David Scandurra +Date: Wed, 25 Oct 2023 20:36:25 +0200 +Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index 57229748ae446d70dbc3d71219d9f81f5c8f72b1..cce782907821b4f84fa865574a7483291369eac7 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -1072,7 +1072,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + + @Override + public void sendEquipmentChange(LivingEntity entity, EquipmentSlot slot, ItemStack item) { +- this.sendEquipmentChange(entity, Map.of(slot, item)); ++ this.sendEquipmentChange(entity, java.util.Collections.singletonMap(slot, item)); // Paper - replace Map.of to allow null values + } + + @Override