aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-09-19 16:36:07 +0200
committerGitHub <[email protected]>2024-09-19 16:36:07 +0200
commitc5a10665b8b80af650500b9263036f778f06d500 (patch)
treefedc133f0dbc101067951e1fccd9d577c312fdb8 /patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
parent5c829557332f21b34bc81e6ad1a73e511faef8f6 (diff)
downloadPaper-c5a10665b8b80af650500b9263036f778f06d500.tar.gz
Paper-c5a10665b8b80af650500b9263036f778f06d500.zip
Remove wall-time / unused skip tick protection (#11412)
Spigot still maintains some partial implementation of "tick skipping", a practice in which the MinecraftServer.currentTick field is updated not by an increment of one per actual tick, but instead set to System.currentTimeMillis() / 50. This behaviour means that the tracked tick may "skip" a tick value in case a previous tick took more than the expected 50ms. To compensate for this in important paths, spigot/craftbukkit implements "wall-time". Instead of incrementing/decrementing ticks on block entities/entities by one for each call to their tick() method, they instead increment/decrement important values, like an ItemEntity's age or pickupDelay, by the difference of `currentTick - lastTick`, where `lastTick` is the value of `currentTick` during the last tick() call. These "fixes" however do not play nicely with minecraft's simulation distance as entities/block entities implementing the above behaviour would "catch up" their values when moving from a non-ticking chunk to a ticking one as their `lastTick` value remains stuck on the last tick in a ticking chunk and hence lead to a large "catch up" once ticked again. Paper completely removes the "tick skipping" behaviour (See patch "Further-improve-server-tick-loop"), making the above precautions completely unnecessary, which also rids paper of the previous described incompatibility with non-ticking chunks.
Diffstat (limited to 'patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch')
-rw-r--r--patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
new file mode 100644
index 0000000000..6839ae5814
--- /dev/null
+++ b/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: David Scandurra <[email protected]>
+Date: Wed, 25 Oct 2023 20:36:25 +0200
+Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 1d79bacbfb24442573245550263141ad56332971..b2abaf6b535da13cdeeb99c568b91c585ac2ed20 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1127,7 +1127,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+
+ @Override
+ public void sendEquipmentChange(LivingEntity entity, EquipmentSlot slot, ItemStack item) {
+- this.sendEquipmentChange(entity, Map.of(slot, item));
++ this.sendEquipmentChange(entity, java.util.Collections.singletonMap(slot, item)); // Paper - replace Map.of to allow null values
+ }
+
+ @Override