Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2aad131e Add config option for command spam whitelist
This commit is contained in:
granny
2025-03-23 12:48:06 -07:00
parent bc8c597baa
commit ca56b414b2
3 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.4-R0.1-SNAPSHOT
mcVersion = 1.21.4
paperCommit = 894631f0d091a3de52aed4b6ec0c4f6c7584d697
paperCommit = 2aad131e74f1cf5c8c7c06f57f39c8060561b6c3
org.gradle.configuration-cache = true
org.gradle.caching = true

View File

@@ -62,10 +62,10 @@ index 6275078467313fe95ae2ae22740135a4b4f39511..7ebecee1de098c218304868b1223b914
private void updatePlayerAttributes() {
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 7b938c0d28af3f15106666e13642e88aa398db4d..9e8fdd28a2b2031e4db011663b67582fce5b3b0f 100644
index 76487a610e149558b021a6a3f7c6cfccb5e6c674..f9af724c579b9931015d460019cca9ff860750c5 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2845,6 +2845,8 @@ public class ServerGamePacketListenerImpl
@@ -2847,6 +2847,8 @@ public class ServerGamePacketListenerImpl
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);

View File

@@ -214,7 +214,7 @@
org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand);
cancelled = event.useItemInHand() == Event.Result.DENY;
} else {
@@ -2751,6 +_,7 @@
@@ -2753,6 +_,7 @@
AABB boundingBox = target.getBoundingBox();
if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range