diff --git a/patches/server/0042-MC-Technical-Survival-Mode.patch b/patches/server/0042-MC-Technical-Survival-Mode.patch index e0af92e..2358239 100644 --- a/patches/server/0042-MC-Technical-Survival-Mode.patch +++ b/patches/server/0042-MC-Technical-Survival-Mode.patch @@ -5,27 +5,6 @@ Subject: [PATCH] MC Technical Survival Mode Will automatically overwrite some configuration after startup -diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -index 8fe9a0bf5a6c27d8a505afc2f51b3dccc905423b..979d70561c1a3b9b539f413ba689a89ab03e413f 100644 ---- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -@@ -331,14 +331,14 @@ public final class ChatProcessor { - } - - static String legacyDisplayName(final CraftPlayer player) { -- if (((org.bukkit.craftbukkit.CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring) { -+ if (((org.bukkit.craftbukkit.CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring || org.leavesmc.leaves.LeavesConfig.mcTechnicalMode) { // Leaves - mc technical mode - return legacySection().serialize(player.teamDisplayName()) + ChatFormatting.RESET; - } - return player.getDisplayName(); - } - - static Component displayName(final CraftPlayer player) { -- if (((CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring) { -+ if (((CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring || org.leavesmc.leaves.LeavesConfig.mcTechnicalMode) { // Leaves - mc technical mode - return player.teamDisplayName(); - } - return player.displayName(); diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java index 1029b6de6f36b08bf634b4056ef5701383f6f258..64bb056d409c19eca724caa8512e6a597623170e 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java