Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7e48f66 Properly pass requirement on namespaced redirects (#10701)
This commit is contained in:
granny
2024-05-12 00:19:29 -07:00
parent 9ace81ba43
commit 818fa0d596
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6
paperCommit = 711f82e01e44d8d86b47040aaa8ce33130b2f194
paperCommit = 7e48f66c05dcc85f8533c96b29fc90b87be65a66
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0041-Skip-events-if-there-s-no-listeners.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 2b33c5f5a7c5c87cf975c5237a2c9ba8cc0d2bdf..733eaf1162642a875708ae311f9426f93c07f711 100644
index 24086a82e1687cb1925398218b18c2384fa8f6e3..6b95a810c2fa17f18bd911dba2c5544caa39173d 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -513,6 +513,7 @@ public class Commands {
@@ -514,6 +514,7 @@ public class Commands {
private void runSync(ServerPlayer player, 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, false).callEvent(); // Paper - Brigadier API
@@ -16,7 +16,7 @@ index 2b33c5f5a7c5c87cf975c5237a2c9ba8cc0d2bdf..733eaf1162642a875708ae311f9426f9
PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
event.getPlayer().getServer().getPluginManager().callEvent(event);
@@ -523,6 +524,7 @@ public class Commands {
@@ -524,6 +525,7 @@ public class Commands {
}
}
// CraftBukkit end

6
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index c57d77a5412463ee842f1cd9f6fa9f66d6f601bf..a92f969e99202922ba27b28f88b738e6f96efc60 100644
index 9a91a29614823e10f59aeaa156d85f7229bfb497..5c048dc779b29c4903dc63daa8a1f9bf54270ba1 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -166,7 +166,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index c57d77a5412463ee842f1cd9f6fa9f66d6f601bf..a92f969e99202922ba27b28f88b738e6
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher, commandRegistryAccess);
@@ -344,9 +344,9 @@ public class Commands {
@@ -345,9 +345,9 @@ public class Commands {
// Paper end
CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
@@ -29,7 +29,7 @@ index c57d77a5412463ee842f1cd9f6fa9f66d6f601bf..a92f969e99202922ba27b28f88b738e6
ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
try {
@@ -376,7 +376,7 @@ public class Commands {
@@ -377,7 +377,7 @@ public class Commands {
Commands.LOGGER.error("'/{}' threw an exception", s, exception);
}
} finally {