2020-01-18 18:28:32 +01:00
|
|
|
From 5777cc7c9975620edb3bf09beec4f760c0f66ae1 Mon Sep 17 00:00:00 2001
|
2018-07-15 03:53:17 +02:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Wed, 6 Apr 2016 01:04:23 -0500
|
|
|
|
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
|
|
|
|
|
2018-11-25 18:16:01 +01:00
|
|
|
This change is basically a bandaid to fix CB's complete and utter lack
|
|
|
|
of support for vanilla scoreboard name modifications.
|
|
|
|
|
|
|
|
In the future, finding a way to merge the vanilla expectations in with
|
|
|
|
bukkit's concept of a display name would be preferable. There was a PR
|
|
|
|
for this on CB at one point but I can't find it. We may need to do this
|
|
|
|
ourselves at some point in the future.
|
2018-07-15 03:53:17 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-01-18 18:28:32 +01:00
|
|
|
index 47f5f8055..b1d1a3c1f 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-01-18 18:28:32 +01:00
|
|
|
@@ -252,4 +252,9 @@ public class PaperWorldConfig {
|
2019-04-27 05:05:36 +02:00
|
|
|
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
|
|
|
|
log("Grass Spread Tick Rate: " + grassUpdateRate);
|
2018-07-15 03:53:17 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean useVanillaScoreboardColoring;
|
|
|
|
+ private void useVanillaScoreboardColoring() {
|
|
|
|
+ useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2019-12-11 03:43:21 +01:00
|
|
|
index f91144693..8f182fcc8 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2019-12-11 03:43:21 +01:00
|
|
|
@@ -1647,7 +1647,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2018-07-15 03:53:17 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
|
|
|
|
+ // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
|
|
|
|
+ String displayName = event.getPlayer().getDisplayName();
|
|
|
|
+ if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
|
2019-12-11 03:43:21 +01:00
|
|
|
+ IChatBaseComponent nameFromTeam = ScoreboardTeam.a(this.player.getScoreboardTeam(), ((CraftPlayer) player).getHandle().getDisplayName());
|
2018-07-25 10:58:03 +02:00
|
|
|
+ // Explicitly add a RESET here, vanilla uses components for this now...
|
2018-11-25 18:16:01 +01:00
|
|
|
+ displayName = CraftChatMessage.fromComponent(nameFromTeam, EnumChatFormat.WHITE) + org.bukkit.ChatColor.RESET;
|
2018-07-15 03:53:17 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ s = String.format(event.getFormat(), displayName, event.getMessage());
|
|
|
|
+ // Paper end
|
|
|
|
minecraftServer.console.sendMessage(s);
|
|
|
|
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
|
|
|
|
for (Object recipient : minecraftServer.getPlayerList().players) {
|
2018-11-25 18:16:01 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-12-11 03:43:21 +01:00
|
|
|
index 05ea0ace5..94a24a49c 100644
|
2018-11-25 18:16:01 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-12-11 03:43:21 +01:00
|
|
|
@@ -178,7 +178,7 @@ public abstract class PlayerList {
|
2018-11-25 18:16:01 +01:00
|
|
|
}
|
2019-04-27 05:05:36 +02:00
|
|
|
// CraftBukkit start
|
2018-11-25 18:16:01 +01:00
|
|
|
chatmessage.a(EnumChatFormat.YELLOW);
|
2019-04-27 05:05:36 +02:00
|
|
|
- String joinMessage = CraftChatMessage.fromComponent(chatmessage);
|
|
|
|
+ String joinMessage = CraftChatMessage.fromComponent(chatmessage, EnumChatFormat.WHITE);
|
|
|
|
|
2019-12-11 03:43:21 +01:00
|
|
|
playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch);
|
2019-04-27 05:05:36 +02:00
|
|
|
this.players.add(entityplayer);
|
2018-07-15 03:53:17 +02:00
|
|
|
--
|
2020-01-18 18:28:32 +01:00
|
|
|
2.25.0.windows.1
|
2018-07-15 03:53:17 +02:00
|
|
|
|