Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions

View File

@@ -0,0 +1,47 @@
--- 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
}