Paper/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch

24 lines
916 B
Diff
Raw Normal View History

From 79703f23ddc633e8427f70dd84304f17a1af2387 Mon Sep 17 00:00:00 2001
2018-07-17 22:32:05 +02:00
From: Aikar <aikar@aikar.co>
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 56787ed25c..f71d9ee578 100644
2018-07-17 22:32:05 +02:00
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
2018-07-26 17:20:37 +02:00
@@ -142,7 +142,7 @@ public final class ItemStack {
2018-07-17 22:32:05 +02:00
}
public boolean isEmpty() {
- return this == ItemStack.a ? true : (this.getItem() != null && this.getItem() != Items.AIR ? this.count <= 0 : true);
+ return this == ItemStack.a || this.item == null || this.item == Items.AIR || this.count <= 0; // Paper
}
public ItemStack cloneAndSubtract(int i) {
--
2.19.0
2018-07-17 22:32:05 +02:00