mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 22:44:17 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
27 lines
1.4 KiB
Diff
27 lines
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 656c9a6d8cd42891141ee29ec91ab5d166051ed6..df847c9897f209700a79aa1a8254b708ef7bf260 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();
|