Restore strings to scoreboard API

SpigotMC · Oct 21, 2023 · 7ec9769 · 7ec9769
1 parent 0ea4679
commit 7ec9769
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/api/src/main/java/net/md_5/bungee/api/score/Objective.java b/api/src/main/java/net/md_5/bungee/api/score/Objective.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.md_5.bungee.api.chat.BaseComponent;
 
 /**
  * Represents an objective entry.
@@ -19,7 +18,7 @@ public class Objective
     /**
      * Value of the objective.
      */
-    private BaseComponent value;
+    private String value;
     /**
      * Type; integer or hearts
      */

diff --git a/api/src/main/java/net/md_5/bungee/api/score/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java
@@ -6,17 +6,16 @@
 import java.util.Set;
 import lombok.Data;
 import lombok.NonNull;
-import net.md_5.bungee.api.chat.BaseComponent;
 
 @Data
 public class Team
 {
 
     @NonNull
     private final String name;
-    private BaseComponent displayName;
-    private BaseComponent prefix;
-    private BaseComponent suffix;
+    private String displayName;
+    private String prefix;
+    private String suffix;
     private byte friendlyFire;
     private String nameTagVisibility;
     private String collisionRule;

diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -24,6 +24,7 @@
 import net.md_5.bungee.api.score.Score;
 import net.md_5.bungee.api.score.Scoreboard;
 import net.md_5.bungee.api.score.Team;
+import net.md_5.bungee.chat.ComponentSerializer;
 import net.md_5.bungee.connection.CancelSendSignal;
 import net.md_5.bungee.connection.DownstreamBridge;
 import net.md_5.bungee.connection.LoginResult;
@@ -278,7 +279,7 @@ public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnec
             Scoreboard serverScoreboard = user.getServerSentScoreboard();
             for ( Objective objective : serverScoreboard.getObjectives() )
             {
-                user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
+                user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), ComponentSerializer.deserialize( objective.getValue() ), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
             }
             for ( Score score : serverScoreboard.getScores() )
             {

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -183,7 +183,7 @@ public void handle(ScoreboardObjective objective) throws Exception
         switch ( objective.getAction() )
         {
             case 0:
-                serverScoreboard.addObjective( new Objective( objective.getName(), objective.getValue(), objective.getType().toString() ) );
+                serverScoreboard.addObjective( new Objective( objective.getName(), ComponentSerializer.toString( objective.getValue() ), objective.getType().toString() ) );
                 break;
             case 1:
                 serverScoreboard.removeObjective( objective.getName() );
@@ -192,7 +192,7 @@ public void handle(ScoreboardObjective objective) throws Exception
                 Objective oldObjective = serverScoreboard.getObjective( objective.getName() );
                 if ( oldObjective != null )
                 {
-                    oldObjective.setValue( objective.getValue() );
+                    oldObjective.setValue( ComponentSerializer.toString( objective.getValue() ) );
                     oldObjective.setType( objective.getType().toString() );
                 }
                 break;
@@ -254,9 +254,9 @@ public void handle(net.md_5.bungee.protocol.packet.Team team) throws Exception
         {
             if ( team.getMode() == 0 || team.getMode() == 2 )
             {
-                t.setDisplayName( team.getDisplayName() );
-                t.setPrefix( team.getPrefix() );
-                t.setSuffix( team.getSuffix() );
+                t.setDisplayName( ComponentSerializer.toString( team.getDisplayName() ) );
+                t.setPrefix( ComponentSerializer.toString( team.getPrefix() ) );
+                t.setSuffix( ComponentSerializer.toString( team.getSuffix() ) );
                 t.setFriendlyFire( team.getFriendlyFire() );
                 t.setNameTagVisibility( team.getNameTagVisibility() );
                 t.setCollisionRule( team.getCollisionRule() );