SpigotMC#3629: Fix scoreboard team data reading

thxrben · Jun 16, 2024 · ec28ec4 · ec28ec4
1 parent 9b5f9e0
commit ec28ec4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Either.java b/protocol/src/main/java/net/md_5/bungee/protocol/Either.java
@@ -1,5 +1,6 @@
 package net.md_5.bungee.protocol;
 
+import java.util.function.Function;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -31,4 +32,26 @@ public static <L, R> Either<L, R> right(R right)
     {
         return new Either<>( null, right );
     }
+
+    public L getLeftOrCompute(Function<R, L> function)
+    {
+        if ( isLeft() )
+        {
+            return left;
+        } else
+        {
+            return function.apply( right );
+        }
+    }
+
+    public R getRightOrCompute(Function<L, R> function)
+    {
+        if ( isRight() )
+        {
+            return right;
+        } else
+        {
+            return function.apply( left );
+        }
+    }
 }
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
@@ -267,9 +267,9 @@ public void handle(net.md_5.bungee.protocol.packet.Team team) throws Exception
         {
             if ( team.getMode() == 0 || team.getMode() == 2 )
             {
-                t.setDisplayName( ComponentSerializer.toString( team.getDisplayName() ) );
-                t.setPrefix( ComponentSerializer.toString( team.getPrefix() ) );
-                t.setSuffix( ComponentSerializer.toString( team.getSuffix() ) );
+                t.setDisplayName( team.getDisplayName().getLeftOrCompute( ComponentSerializer::toString ) );
+                t.setPrefix( team.getPrefix().getLeftOrCompute( ComponentSerializer::toString ) );
+                t.setSuffix( team.getSuffix().getLeftOrCompute( ComponentSerializer::toString ) );
                 t.setFriendlyFire( team.getFriendlyFire() );
                 t.setNameTagVisibility( team.getNameTagVisibility() );
                 t.setCollisionRule( team.getCollisionRule() );