diff --git a/gradle.properties b/gradle.properties index 7a667c728..f739b3509 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/patches/server/0041-Skip-events-if-there-s-no-listeners.patch b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch index f20d2e6da..e32a4bfec 100644 --- a/patches/server/0041-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch @@ -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 bukkit, RootCommandNode rootcommandnode) { // Paper end - Perf: Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(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 diff --git a/patches/server/0255-Remove-Mojang-Profiler.patch b/patches/server/0255-Remove-Mojang-Profiler.patch index 63897dbb1..577bd901b 100644 --- a/patches/server/0255-Remove-Mojang-Profiler.patch +++ b/patches/server/0255-Remove-Mojang-Profiler.patch @@ -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 {