diff --git a/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java b/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java index e7c01f032..2441a1a44 100644 --- a/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java +++ b/api/src/main/java/net/md_5/bungee/api/scoreboard/Scoreboard.java @@ -5,22 +5,22 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import lombok.AccessLevel; import lombok.Data; -import lombok.Getter; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor public class Scoreboard { /** * Unique name for this scoreboard. */ - private final String name; + private String name; /** * Position of this scoreboard. */ - private final Position position; + private Position position; /** * Objectives for this scoreboard. */ @@ -88,4 +88,13 @@ public class Scoreboard { teams.remove( teamName ); } + + public void clear() + { + name = null; + position = null; + objectives.clear(); + scores.clear(); + teams.clear(); + } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index 283be4599..869cb3bcd 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -13,7 +13,6 @@ import net.md_5.bungee.api.config.TexturePackInfo; import net.md_5.bungee.api.event.ServerConnectedEvent; import net.md_5.bungee.api.event.ServerKickEvent; import net.md_5.bungee.api.scoreboard.Objective; -import net.md_5.bungee.api.scoreboard.Score; import net.md_5.bungee.api.scoreboard.Team; import net.md_5.bungee.connection.CancelSendSignal; import net.md_5.bungee.connection.DownstreamBridge; @@ -23,7 +22,6 @@ import net.md_5.bungee.packet.Packet1Login; import net.md_5.bungee.packet.Packet9Respawn; import net.md_5.bungee.packet.PacketCDClientStatus; import net.md_5.bungee.packet.PacketCEScoreboardObjective; -import net.md_5.bungee.packet.PacketCFScoreboardScore; import net.md_5.bungee.packet.PacketD1Team; import net.md_5.bungee.packet.PacketFAPluginMessage; import net.md_5.bungee.packet.PacketFDEncryptionRequest; @@ -114,18 +112,15 @@ public class ServerConnector extends PacketHandler { bungee.getTabListHandler().onServerChange( user ); - if ( user.serverSentScoreboard != null ) + for ( Objective objective : user.serverSentScoreboard.getObjectives() ) { - for ( Objective objective : user.serverSentScoreboard.getObjectives() ) - { - user.ch.write( new PacketCEScoreboardObjective( objective.getName(), objective.getValue(), (byte) 1 ) ); - } - for ( Team team : user.serverSentScoreboard.getTeams() ) - { - user.ch.write( PacketD1Team.destroy( team.getName() ) ); - } - user.serverSentScoreboard = null; + user.ch.write( new PacketCEScoreboardObjective( objective.getName(), objective.getValue(), (byte) 1 ) ); } + for ( Team team : user.serverSentScoreboard.getTeams() ) + { + user.ch.write( PacketD1Team.destroy( team.getName() ) ); + } + user.serverSentScoreboard.clear(); user.sendPacket( Packet9Respawn.DIM1_SWITCH ); user.sendPacket( Packet9Respawn.DIM2_SWITCH ); diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index f5ade346e..dd11d967a 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -62,7 +62,7 @@ public final class UserConnection implements ProxiedPlayer @Getter private final Object switchMutex = new Object(); public PacketCCSettings settings; - public Scoreboard serverSentScoreboard; + public final Scoreboard serverSentScoreboard = new Scoreboard(); public UserConnection(BungeeCord bungee, Channel channel, PendingConnection pendingConnection, Packet2Handshake handshake, Packet1Login forgeLogin, List loginMessages) { 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 index 431f78acf..96574148d 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -23,7 +23,6 @@ import net.md_5.bungee.api.scoreboard.Scoreboard; import net.md_5.bungee.api.scoreboard.Team; import net.md_5.bungee.packet.Packet0KeepAlive; import net.md_5.bungee.packet.Packet3Chat; -import net.md_5.bungee.packet.Packet9Respawn; import net.md_5.bungee.packet.PacketC9PlayerListItem; import net.md_5.bungee.packet.PacketCEScoreboardObjective; import net.md_5.bungee.packet.PacketCFScoreboardScore; @@ -106,75 +105,67 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(PacketCEScoreboardObjective objective) throws Exception { - if ( con.serverSentScoreboard != null ) + switch ( objective.action ) { - switch ( objective.action ) - { - case 0: - con.serverSentScoreboard.addObjective( new Objective( objective.name, objective.text ) ); - break; - case 1: - con.serverSentScoreboard.removeObjective( objective.name ); - break; - } + case 0: + con.serverSentScoreboard.addObjective( new Objective( objective.name, objective.text ) ); + break; + case 1: + con.serverSentScoreboard.removeObjective( objective.name ); + break; } } @Override public void handle(PacketCFScoreboardScore score) throws Exception { - if ( con.serverSentScoreboard != null ) + switch ( score.action ) { - switch ( score.action ) - { - case 0: - con.serverSentScoreboard.addScore( new Score( score.itemName, score.scoreName, score.value ) ); - break; - case 1: - con.serverSentScoreboard.removeScore( score.itemName ); - break; - } + case 0: + con.serverSentScoreboard.addScore( new Score( score.itemName, score.scoreName, score.value ) ); + break; + case 1: + con.serverSentScoreboard.removeScore( score.itemName ); + break; } } @Override public void handle(PacketD0DisplayScoreboard displayScoreboard) throws Exception { - con.serverSentScoreboard = new Scoreboard( displayScoreboard.name, Position.values()[displayScoreboard.position] ); + con.serverSentScoreboard.setName( displayScoreboard.name ); + con.serverSentScoreboard.setPosition( Position.values()[displayScoreboard.position] ); } @Override public void handle(PacketD1Team team) throws Exception { - if ( con.serverSentScoreboard != null ) + // Remove team and move on + if ( team.mode == 1 ) { - // Remove team and move on - if ( team.mode == 1 ) - { - con.serverSentScoreboard.removeTeam( team.name ); - return; - } + con.serverSentScoreboard.removeTeam( team.name ); + return; + } - // Create or get old team - Team t = ( team.mode == 0 ) ? new Team( team.name ) : con.serverSentScoreboard.getTeam( team.name ); - if ( t != null ) + // Create or get old team + Team t = ( team.mode == 0 ) ? new Team( team.name ) : con.serverSentScoreboard.getTeam( team.name ); + if ( t != null ) + { + if ( team.mode == 0 || team.mode == 2 ) { - if ( team.mode == 0 || team.mode == 2 ) + t.setDisplayName( team.displayName ); + t.setPrefix( team.prefix ); + t.setSuffix( team.suffix ); + t.setFriendlyMode( team.friendlyFire ); + } + for ( String s : team.players ) + { + if ( team.mode == 0 || team.mode == 3 ) { - t.setDisplayName( team.displayName ); - t.setPrefix( team.prefix ); - t.setSuffix( team.suffix ); - t.setFriendlyMode( team.friendlyFire ); - } - for ( String s : team.players ) + t.addPlayer( s ); + } else { - if ( team.mode == 0 || team.mode == 3 ) - { - t.addPlayer( s ); - } else - { - t.removePlayer( s ); - } + t.removePlayer( s ); } } } diff --git a/proxy/src/main/java/net/md_5/bungee/packet/PacketD0DisplayScoreboard.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketD0DisplayScoreboard.java index 4eaeeb0cf..f2a534fa9 100644 --- a/proxy/src/main/java/net/md_5/bungee/packet/PacketD0DisplayScoreboard.java +++ b/proxy/src/main/java/net/md_5/bungee/packet/PacketD0DisplayScoreboard.java @@ -16,7 +16,7 @@ public class PacketD0DisplayScoreboard extends DefinedPacket public PacketD0DisplayScoreboard(byte[] buf) { - super( 0xCF, buf ); + super( 0xD0, buf ); position = readByte(); name = readUTF(); }