aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch')
-rw-r--r--Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
new file mode 100644
index 0000000000..db9d36cf21
--- /dev/null
+++ b/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
@@ -0,0 +1,31 @@
+From edad739b97db0413196220e110ae87f18f782a13 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 21 Dec 2016 03:48:29 -0500
+Subject: [PATCH] Optimize ItemStack.isEmpty()
+
+Remove hashMap lookup every check, simplify code to remove ternary
+
+diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
+index aca63be53..548da18e0 100644
+--- a/src/main/java/net/minecraft/server/ItemStack.java
++++ b/src/main/java/net/minecraft/server/ItemStack.java
+@@ -120,9 +120,15 @@ public final class ItemStack {
+ this.F();
+ }
+
++ // Paper start - optimize isEmpty
++ private static Item airItem;
+ public boolean isEmpty() {
+- return this == ItemStack.a ? true : (this.item != null && this.item != Item.getItemOf(Blocks.AIR) ? (this.count <= 0 ? true : this.damage < -32768 || this.damage > '\uffff') : true);
++ if (airItem == null) {
++ airItem = Item.REGISTRY.get(new MinecraftKey("air"));
++ }
++ return this == ItemStack.a || this.item == null || this.item == airItem || (this.count <= 0 || (this.damage < -32768 || this.damage > '\uffff'));
+ }
++ // Paper end
+
+ public static void a(DataConverterManager dataconvertermanager) {
+ dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
+--
+2.12.2
+