Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fd69140d Fix `disable-tripwire-updates` option not cancelling tripwire hook updates (#12129)
PaperMC/Paper@3b9106c7 Readd dead redirect recovery (#12136)
PaperMC/Paper@d26a9e90 Fix plugin commands (#12144)
PaperMC/Paper@142695eb Default minecraft alias to redirect (#12146)
PaperMC/Paper@e494f289 Correctly call BlockFadeEvents (#12141)
PaperMC/Paper@b386a8f5 Add simpler JavaPlugin command registration (#12142)
PaperMC/Paper@f0700818 Remove Experimental from TypedKey (#12134)
PaperMC/Paper@09f1f88f Fix getForwards/SidewaysMovement for players (#12140)
  • Loading branch information
granny committed Feb 18, 2025
1 parent 97dcff4 commit a9862d7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.4-R0.1-SNAPSHOT

mcVersion = 1.21.4
paperCommit = 8eb8e44ac32a99f53da7af50e800ac8831030580
paperCommit = 09f1f88f58a03f61092f8636ad780d42db87d8d9

org.gradle.configuration-cache = true
org.gradle.caching = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1468,4 +_,20 @@
@@ -1476,4 +_,20 @@
*/
boolean canUseEquipmentSlot(org.bukkit.inventory.@NotNull EquipmentSlot slot);
// Paper end - Expose canUseSlot
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -216,8 +_,8 @@
@@ -221,8 +_,8 @@
JfrCommand.register(this.dispatcher);
}

Expand All @@ -11,7 +11,7 @@
RaidCommand.register(this.dispatcher, context);
DebugPathCommand.register(this.dispatcher);
DebugMobSpawningCommand.register(this.dispatcher);
@@ -245,6 +_,14 @@
@@ -250,6 +_,14 @@
StopCommand.register(this.dispatcher);
TransferCommand.register(this.dispatcher);
WhitelistCommand.register(this.dispatcher);
Expand All @@ -26,15 +26,15 @@
}

if (selection.includeIntegrated) {
@@ -482,6 +_,7 @@
@@ -503,6 +_,7 @@
private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootCommandNode) {
// Paper end - Perf: Async command map building
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
+ if (org.bukkit.event.player.PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - Skip events if there's no listeners
org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
event.getPlayer().getServer().getPluginManager().callEvent(event);

@@ -492,6 +_,7 @@
@@ -513,6 +_,7 @@
}
}
// CraftBukkit end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) {
return;
}
@@ -174,7 +_,7 @@
@@ -177,7 +_,7 @@
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
private void validateSpeed(float value) {
Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
}
@@ -3583,4 +_,76 @@
handle.containerMenu.broadcastChanges();
return new PaperPlayerGiveResult(leftovers.build(), drops.build());
@@ -3599,4 +_,76 @@

return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1;
}
+
+ // Purpur start - Purpur client support
Expand Down

0 comments on commit a9862d7

Please sign in to comment.