SPIGOT-4015: Make CraftTeam tie into backing prefix/suffix

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-16 10:20:53 +10:00
parent c5cc779f03
commit 5d2f9be56c
2 changed files with 4 additions and 52 deletions

View File

@@ -1,47 +0,0 @@
--- a/net/minecraft/server/ScoreboardTeam.java
+++ b/net/minecraft/server/ScoreboardTeam.java
@@ -36,7 +36,7 @@
}
public String getDisplayName() {
- return this.d;
+ return this.prefix + this.d + this.suffix; // CraftBukkit
}
public IChatBaseComponent d() {
@@ -165,4 +165,35 @@
public EnumChatFormat getColor() {
return this.k;
}
+
+ // CraftBukkit start
+ private String prefix = "";
+ private String suffix = "";
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ if (prefix == null) {
+ throw new IllegalArgumentException("Prefix cannot be null");
+ }
+
+ this.prefix = prefix;
+ this.a.handleTeamChanged(this);
+ }
+
+ public String getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(String suffix) {
+ if (prefix == null) {
+ throw new IllegalArgumentException("Suffix cannot be null");
+ }
+
+ this.suffix = suffix;
+ this.a.handleTeamChanged(this);
+ }
+ // CraftBukkit end
}