geforkt von Mirrors/Paper
c5a10665b8
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.
27 Zeilen
1.4 KiB
Diff
27 Zeilen
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: strnq <dev@aruus.uk>
|
|
Date: Sat, 14 Sep 2024 12:53:13 +0300
|
|
Subject: [PATCH] Validate slot in PlayerInventory#setSlot
|
|
|
|
The CraftPlayerInventory implementation sends a container_set_slot
|
|
packet to the client which will error if an invalid slot is passed to
|
|
the setSlot method, making a validation necessary over simply silently
|
|
ignoring invalid slot values.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
index eafa54c870c3e2aef30c3f9f96f516607a7cae24..8dea4321e41080829b474ad7b5a12c6a622181fd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
@@ -70,6 +70,11 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
|
|
|
|
@Override
|
|
public void setItem(int index, ItemStack item) {
|
|
+ // Paper start - Validate setItem index
|
|
+ if (index < 0 || index > 40) {
|
|
+ throw new ArrayIndexOutOfBoundsException("Index must be between 0 and 40");
|
|
+ }
|
|
+ // Paper end - Validate setItem index
|
|
super.setItem(index, item);
|
|
if (this.getHolder() == null) return;
|
|
ServerPlayer player = ((CraftPlayer) this.getHolder()).getHandle();
|