SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOT WORKING! Even even more patches!

Browse Source
This commit is contained in:
Shane Freeder
2018-07-17 21:32:05 +01:00
parent 828dea48de
commit c8d8659ad3
24 changed files with 147 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/Optimize-ItemStack.isEmpty.patch
View File

@@ -6,24 +6,16 @@ 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 5047a57e9..736686bed 100644
index 70f2dcc9e..be6205275 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -0,0 +0,0 @@ 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'));
- 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
}
+ // Paper end
public static void a(DataConverterManager dataconvertermanager) {
dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
public ItemStack cloneAndSubtract(int i) {
--