Remove last bit of chunk exists region file fix
CraftBukkit removed their implementation that caused this issue, switching to Mojang's implementation which doesn't appear to share it. I already removed the important bit in the last upstream merge, this is just unused and unnecessary now. So we remove it.
This commit is contained in:
31
Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
Normal file
31
Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
From b44bf1c80442b336a199ef736c5e055c6aa9a763 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 aca63be53..548da18e0 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -120,9 +120,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.12.2.windows.2
|
||||
|
||||
Reference in New Issue
Block a user