diff options
| author | Nassim Jahnke <[email protected]> | 2024-06-16 12:56:00 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-06-16 12:56:00 +0200 |
| commit | dc684c60d16f66ea84467ec8e253f2a36a17a7c8 (patch) | |
| tree | e516f1bd4bfbdb37a5aeee42384aade111eca3e1 /patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch | |
| parent | 752f957e12e4ceb8b7d2043a4a7dbce786b7b98f (diff) | |
| download | Paper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.tar.gz Paper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.zip | |
Remove bad server.scheduleOnMain disconnect calls from old patches
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
Diffstat (limited to 'patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch')
| -rw-r--r-- | patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch new file mode 100644 index 0000000000..4e10b7651f --- /dev/null +++ b/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aeltumn <[email protected]> +Date: Mon, 28 Aug 2023 13:44:09 +0200 +Subject: [PATCH] Allow proper checking of empty item stacks + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +index 8d7e7e831792422d6e9f3210496c577fb64d597f..41c0cfc88f2ec48c1bb8ac10a78f89bf1f2f2319 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +@@ -39,12 +39,19 @@ public final class CraftItemStack extends ItemStack { + } + // Paper end - MC Utils + ++ // Paper start - override isEmpty to use vanilla's impl ++ @Override ++ public boolean isEmpty() { ++ return handle == null || handle.isEmpty(); ++ } ++ // Paper end - override isEmpty to use vanilla's impl ++ + public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) { + if (original instanceof CraftItemStack) { + CraftItemStack stack = (CraftItemStack) original; + return stack.handle == null ? net.minecraft.world.item.ItemStack.EMPTY : stack.handle.copy(); + } +- if (original == null || original.getType() == Material.AIR) { ++ if (original == null || original.isEmpty()) { // Paper - override isEmpty to use vanilla's impl; use isEmpty + return net.minecraft.world.item.ItemStack.EMPTY; + } + |