diff --git a/gradle.properties b/gradle.properties index a1ea3c51a..f92fe75fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.2-R0.1-SNAPSHOT -paperCommit = f1583fcd7414bde1ee2efc2b1395a82cdb78b8a2 +paperCommit = 309133e2e14502e3734e5be8aec4068549abf3f8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch index fc10e0771..6a263975d 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d35eee8011e0c1a8b2885054597cfd88b1192795..bbb02e62fe7ea9a96929563fc4ab6e82f4f35974 100644 +index d35eee8011e0c1a8b2885054597cfd88b1192795..f12a961318810f94c0e4029686885a0291636c1d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2022,8 +2022,63 @@ public class ServerPlayer extends Player { @@ -49,7 +49,7 @@ index d35eee8011e0c1a8b2885054597cfd88b1192795..bbb02e62fe7ea9a96929563fc4ab6e82 + String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, ""); + String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, ""); + if (afk) { -+ getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + suffix + scoreboardName + prefix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true); ++ getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + prefix + scoreboardName + suffix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true); + } else { + getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix); + } diff --git a/patches/server/0257-Max-joins-per-second.patch b/patches/server/0257-Max-joins-per-second.patch index c390290cb..a8b593428 100644 --- a/patches/server/0257-Max-joins-per-second.patch +++ b/patches/server/0257-Max-joins-per-second.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Max joins per second When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 69b8d1276045cd6742770dcedd6246bb1713fd3b..2a71c8e6901944af90c4ad4dfa39dba7fafc0126 100644 +index f1e1a4a48349c0e431b31327fdf217989db027b3..2b0ec158ff789b94fcc89ea3b4e8ece6d7185c57 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -555,11 +555,20 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -563,11 +563,20 @@ public class Connection extends SimpleChannelInboundHandler> { private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper private static int joinAttemptsThisTick; // Paper private static int currTick; // Paper