Skip to content

Commit

Permalink
Remove useVanillaWorldScoreboardNameColoring to fix #367
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yh-china committed Nov 7, 2024
1 parent 423df96 commit a8a9d1b
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions patches/server/0042-MC-Technical-Survival-Mode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a8a9d1b

Please sign in to comment.