From 3890544e04e1b406b97c0f098a575ecc4b8865c6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 16 Jul 2018 10:20:53 +1000 Subject: SPIGOT-4015: Make CraftTeam tie into backing prefix/suffix --- src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java index 17865e65..1cbcfc94 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -47,7 +47,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { public String getPrefix() throws IllegalStateException { CraftScoreboard scoreboard = checkState(); - return team.getPrefix(); + return CraftChatMessage.fromComponent(team.e()); } public void setPrefix(String prefix) throws IllegalStateException, IllegalArgumentException { @@ -55,13 +55,13 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { Validate.isTrue(prefix.length() <= 16, "Prefix '" + prefix + "' is longer than the limit of 16 characters"); CraftScoreboard scoreboard = checkState(); - team.setPrefix(prefix); + team.a(CraftChatMessage.fromStringOrNull(prefix)); } public String getSuffix() throws IllegalStateException { CraftScoreboard scoreboard = checkState(); - return team.getSuffix(); + return CraftChatMessage.fromComponent(team.f()); } public void setSuffix(String suffix) throws IllegalStateException, IllegalArgumentException { @@ -69,7 +69,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { Validate.isTrue(suffix.length() <= 16, "Suffix '" + suffix + "' is longer than the limit of 16 characters"); CraftScoreboard scoreboard = checkState(); - team.setSuffix(suffix); + team.b(CraftChatMessage.fromStringOrNull(suffix)); } @Override @@ -85,7 +85,6 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { CraftScoreboard scoreboard = checkState(); team.setColor(CraftChatMessage.getColor(color)); - scoreboard.board.handleTeamChanged(team); // SPIGOT-3684 - backing team fires this for prefix/suffix but not colour } public boolean allowFriendlyFire() throws IllegalStateException { -- cgit v1.2.3