Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 01:47:42 +01:00
Code Issues Projects Releases Wiki Activity
c36f206209
Paper/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch

24 lines
914 B
Diff
Raw Normal View History

PlayerDeathEvent#getItemsToKeep Exposes a mutable array on items a player should keep on death. This allows a cleaner method to implement "Keep certain items on death" than how plugins currently do it in that it never removes them in first place, so its safe if the player logs out/server is shutdown before respawn. Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
2019-03-28 05:58:05 +01:00
From 127e1e338fa2acd16ab6a7ca19ae1e504dd65bac Mon Sep 17 00:00:00 2001
NOT WORKING! Even even more patches!
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
PlayerDeathEvent#getItemsToKeep Exposes a mutable array on items a player should keep on death. This allows a cleaner method to implement "Keep certain items on death" than how plugins currently do it in that it never removes them in first place, so its safe if the player logs out/server is shutdown before respawn. Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
2019-03-28 05:58:05 +01:00
index e0f782acc..865ff2ee1 100644
NOT WORKING! Even even more patches!
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
PlayerDeathEvent#getItemsToKeep Exposes a mutable array on items a player should keep on death. This allows a cleaner method to implement "Keep certain items on death" than how plugins currently do it in that it never removes them in first place, so its safe if the player logs out/server is shutdown before respawn. Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
2019-03-28 05:58:05 +01:00
@@ -151,7 +151,7 @@ public final class ItemStack {
NOT WORKING! Even even more patches!
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) {
--
PlayerDeathEvent#getItemsToKeep Exposes a mutable array on items a player should keep on death. This allows a cleaner method to implement "Keep certain items on death" than how plugins currently do it in that it never removes them in first place, so its safe if the player logs out/server is shutdown before respawn. Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
2019-03-28 05:58:05 +01:00
2.21.0
NOT WORKING! Even even more patches!
2018-07-17 22:32:05 +02:00
Reference in New Issue Copy Permalink