e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
24 Zeilen
916 B
Diff
24 Zeilen
916 B
Diff
From 67a0f28671a63dd0541a0cbc89a93c374c445ffd Mon Sep 17 00:00:00 2001
|
|
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 db11c8ec69..854cffe6c9 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
|
@@ -150,7 +150,7 @@ public final class ItemStack {
|
|
}
|
|
|
|
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.25.1
|
|
|