2018-07-23 08:39:55 +00:00
|
|
|
From 4dc090c70a0b01357032d2293e26ecb341779756 Mon Sep 17 00:00:00 2001
|
2018-07-17 20:32:05 +00: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
|
2018-07-23 08:39:55 +00:00
|
|
|
index e120521611..023dd48a23 100644
|
2018-07-17 20:32:05 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
2018-07-19 04:42:43 +00:00
|
|
|
@@ -140,7 +140,7 @@ public final class ItemStack {
|
2018-07-17 20:32:05 +00: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.18.0
|
|
|
|
|