diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 14cc3c55d..519efa0bb 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -37,7 +37,7 @@ index 2cada09ced..a69a698594 100644 super(EntityTypes.PLAYER, world); this.bS = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8fd3c913ac..fa090422da 100644 +index 0f9550fb87..a23f237029 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -75,7 +75,7 @@ index 8fd3c913ac..fa090422da 100644 + } + + if (world.purpurConfig.idleTimeoutUpdateTabList) { -+ getBukkitEntity().setPlayerListName((setAfk ? "[AFK] " : "") + getName()); ++ getBukkitEntity().setPlayerListName((setAfk ? net.pl3x.purpur.PurpurConfig.afkTabListPrefix : "") + getName()); + } + + ((WorldServer) world).everyoneSleeping(); @@ -205,7 +205,7 @@ index 37f55c66b6..aa6855c356 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fff694c370..efc2ea044a 100644 +index bc3a7d1513..9191d77864 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -862,7 +862,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -227,7 +227,7 @@ index fff694c370..efc2ea044a 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index fc38163b19..cc08ad33e4 100644 +index 803a7ff92a..d699a91685 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -238,15 +238,17 @@ index fc38163b19..cc08ad33e4 100644 import net.minecraft.server.MinecraftServer; import net.pl3x.purpur.command.PurpurCommand; import org.bukkit.Bukkit; -@@ -129,6 +130,13 @@ public class PurpurConfig { +@@ -129,6 +130,15 @@ public class PurpurConfig { return config.getString(path, config.getString(path)); } + public static String afkBroadcastAway = "§e§o%s is now AFK"; + public static String afkBroadcastBack = "§e§o%s is no longer AFK"; ++ public static String afkTabListPrefix = "[AFK] "; + private static void messages() { + afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway); + afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack); ++ afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix); + } + public static String timingsUrl = "https://timings.pl3x.net"; @@ -273,7 +275,7 @@ index 361f7857e4..2578a4677d 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8f2b84a84a..e8c8ba74b9 100644 +index b832ece494..c278ad57d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2149,4 +2149,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch index e448c0f6b..8f4f02def 100644 --- a/patches/server/0011-Configurable-server-mod-name.patch +++ b/patches/server/0011-Configurable-server-mod-name.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e23e47ee7..ba0260fa5 100644 +index e23e47ee77..ba0260fa54 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { @@ -17,7 +17,7 @@ index 8e93f1540..470f92c4f 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a7ace9034..bbe56cefe 100644 +index a7ace9034d..bbe56cefe1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -68,10 +68,10 @@ index a7ace9034..bbe56cefe 100644 if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d8b826f6b..571917ffa 100644 +index 6ff5e07834..f1d6c32fde 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -152,6 +152,11 @@ public class PurpurConfig { +@@ -154,6 +154,11 @@ public class PurpurConfig { laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold); } diff --git a/patches/server/0031-MC-4-Fix-Item-position-desync.patch b/patches/server/0031-MC-4-Fix-Item-position-desync.patch index a1d3b1a70..09d8fedb3 100644 --- a/patches/server/0031-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0031-MC-4-Fix-Item-position-desync.patch @@ -5,7 +5,7 @@ Subject: [PATCH] MC-4 Fix - Item position desync diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index bfb931268..e9bc546f8 100644 +index bfb931268d..e9bc546f80 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -134,6 +134,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index bfb931268..e9bc546f8 100644 boolean flag2 = flag1 || this.tickCounter % 60 == 0; boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index e5da2b19c..6d9d52e4f 100644 +index e5da2b19c1..6d9d52e4fc 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet { @@ -39,10 +39,10 @@ index e5da2b19c..6d9d52e4f 100644 return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 571917ffa..4ac6fa44b 100644 +index f1d6c32fde..04ed0b1dba 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -175,4 +175,9 @@ public class PurpurConfig { +@@ -177,4 +177,9 @@ public class PurpurConfig { InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } diff --git a/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch index f66301610..68d878c1f 100644 --- a/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs) diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index d3387a4e1..fd2202003 100644 +index d3387a4e16..fd22020037 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -165,6 +165,7 @@ public class AdvancementDataPlayer { @@ -17,10 +17,10 @@ index d3387a4e1..fd2202003 100644 } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4ac6fa44b..b520cd28b 100644 +index 04ed0b1dba..83d146a18c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -180,4 +180,11 @@ public class PurpurConfig { +@@ -182,4 +182,11 @@ public class PurpurConfig { private static void fixItemPositionDesync() { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); } @@ -33,7 +33,7 @@ index 4ac6fa44b..b520cd28b 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -index b14333ce9..d25204f7d 100644 +index b14333ce9e..d25204f7d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java @@ -254,6 +254,7 @@ public final class CraftLegacy { diff --git a/patches/server/0042-Dont-send-useless-entity-packets.patch b/patches/server/0042-Dont-send-useless-entity-packets.patch index 0aeab8d66..e40b7e04b 100644 --- a/patches/server/0042-Dont-send-useless-entity-packets.patch +++ b/patches/server/0042-Dont-send-useless-entity-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont send useless entity packets diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index e9bc546f8..c28e67f9b 100644 +index e9bc546f80..c28e67f9bf 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -178,6 +178,7 @@ public class EntityTrackerEntry { @@ -40,7 +40,7 @@ index e9bc546f8..c28e67f9b 100644 this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java -index 6d9d52e4f..0010448e3 100644 +index 6d9d52e4fc..0010448e3a 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -5,11 +5,11 @@ import java.io.IOException; @@ -61,10 +61,10 @@ index 6d9d52e4f..0010448e3 100644 protected boolean h; protected boolean i; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b520cd28b..e8a0438ec 100644 +index 83d146a18c..30935339e8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -176,6 +176,11 @@ public class PurpurConfig { +@@ -178,6 +178,11 @@ public class PurpurConfig { enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } diff --git a/patches/server/0069-Configurable-TPS-Catchup.patch b/patches/server/0069-Configurable-TPS-Catchup.patch index bcfb1c48c..f3053f5ea 100644 --- a/patches/server/0069-Configurable-TPS-Catchup.patch +++ b/patches/server/0069-Configurable-TPS-Catchup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8ed47fe05..5acd2a97c 100644 +index 8ed47fe054..5acd2a97c4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant