2017-11-08 16:13:57 +00:00
|
|
|
From 8d9dbd8a595e6f850385054bf6b0c78a067a5b9b Mon Sep 17 00:00:00 2001
|
2016-04-06 06:10:26 +00: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
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2017-08-03 14:36:06 +00:00
|
|
|
index 3a942c763..3bd29650c 100644
|
2016-04-06 06:10:26 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2017-03-25 03:18:58 +00:00
|
|
|
@@ -290,4 +290,9 @@ public class PaperWorldConfig {
|
2016-04-06 06:10:26 +00:00
|
|
|
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
|
|
|
|
log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean useVanillaScoreboardColoring;
|
|
|
|
+ private void useVanillaScoreboardColoring() {
|
|
|
|
+ useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
|
|
|
|
+ }
|
|
|
|
}
|
2016-07-27 22:46:02 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2017-11-08 16:13:57 +00:00
|
|
|
index a6d472139..1d31bcde8 100644
|
2016-07-27 22:46:02 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2017-11-08 16:13:57 +00:00
|
|
|
@@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
|
2016-07-27 22:46:02 +00:00
|
|
|
return this.getFlag(5);
|
|
|
|
}
|
|
|
|
|
2017-06-08 14:16:51 +00:00
|
|
|
+ @Nullable public ScoreboardTeamBase getTeam() { return this.aY(); } // Paper - OBFHELPER
|
2016-07-27 22:46:02 +00:00
|
|
|
@Nullable
|
2017-06-08 14:16:51 +00:00
|
|
|
public ScoreboardTeamBase aY() {
|
2016-07-27 22:46:02 +00:00
|
|
|
if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
|
2016-04-06 06:10:26 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2017-11-08 16:13:57 +00:00
|
|
|
index 70fb4f6b0..187e59a08 100644
|
2016-04-06 06:10:26 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2017-11-08 16:13:57 +00:00
|
|
|
@@ -1390,7 +1390,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
2016-04-06 06:10:26 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
|
2016-04-07 22:31:06 +00:00
|
|
|
+ // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
|
|
|
|
+ String displayName = event.getPlayer().getDisplayName();
|
2016-04-06 06:10:26 +00:00
|
|
|
+ if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {
|
2016-07-27 22:46:02 +00:00
|
|
|
+ displayName = ScoreboardTeam.getPlayerDisplayName(this.player.getTeam(), player.getDisplayName());
|
2016-04-06 06:10:26 +00:00
|
|
|
+ }
|
2016-04-07 22:31:06 +00:00
|
|
|
+
|
|
|
|
+ s = String.format(event.getFormat(), displayName, event.getMessage());
|
2016-04-06 06:10:26 +00:00
|
|
|
+ // Paper end
|
2016-04-07 22:31:06 +00:00
|
|
|
minecraftServer.console.sendMessage(s);
|
2016-04-06 06:10:26 +00:00
|
|
|
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
|
|
|
|
for (Object recipient : minecraftServer.getPlayerList().players) {
|
|
|
|
--
|
2017-11-08 16:13:57 +00:00
|
|
|
2.14.3
|
2016-04-06 06:10:26 +00:00
|
|
|
|