Skip to content

Commit ca56b41

Browse files
committed
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
1 parent bc8c597 commit ca56b41

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.4-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.4
5-
paperCommit = 894631f0d091a3de52aed4b6ec0c4f6c7584d697
5+
paperCommit = 2aad131e74f1cf5c8c7c06f57f39c8060561b6c3
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

purpur-server/minecraft-patches/features/0001-Ridables.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ index 6275078467313fe95ae2ae22740135a4b4f39511..7ebecee1de098c218304868b1223b914
6262

6363
private void updatePlayerAttributes() {
6464
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
65-
index 7b938c0d28af3f15106666e13642e88aa398db4d..9e8fdd28a2b2031e4db011663b67582fce5b3b0f 100644
65+
index 76487a610e149558b021a6a3f7c6cfccb5e6c674..f9af724c579b9931015d460019cca9ff860750c5 100644
6666
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6767
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
68-
@@ -2845,6 +2845,8 @@ public class ServerGamePacketListenerImpl
68+
@@ -2847,6 +2847,8 @@ public class ServerGamePacketListenerImpl
6969

7070
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
7171

purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand);
215215
cancelled = event.useItemInHand() == Event.Result.DENY;
216216
} else {
217-
@@ -2751,6 +_,7 @@
217+
@@ -2753,6 +_,7 @@
218218

219219
AABB boundingBox = target.getBoundingBox();
220220
if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range

0 commit comments

Comments
 (0)