From 98e7d01ce8b950346c5331925e4351defab5b28f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 04:21:42 -0500 Subject: [PATCH] Optimize isEmpty() to remove Map lookup Every call to .isEmpty() made a horribly wasteful map lookup just to get the reference to the Air Item for checking. We will now cache a copy of that item --- .../0188-Optimize-ItemStack.isEmpty.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Spigot-Server-Patches/0188-Optimize-ItemStack.isEmpty.patch diff --git a/Spigot-Server-Patches/0188-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0188-Optimize-ItemStack.isEmpty.patch new file mode 100644 index 0000000000..461f15818f --- /dev/null +++ b/Spigot-Server-Patches/0188-Optimize-ItemStack.isEmpty.patch @@ -0,0 +1,31 @@ +From ae097c16d9540ec79890ddb5ba0efe693874621a Mon Sep 17 00:00:00 2001 +From: Aikar +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 c8694e8b9..6db93b953 100644 +--- a/src/main/java/net/minecraft/server/ItemStack.java ++++ b/src/main/java/net/minecraft/server/ItemStack.java +@@ -112,9 +112,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.11.0 +