Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-03 15:43:40 +01:00
Code Issues Projects Releases Wiki Activity

Various scoreboard improvements. (#2204)

Browse Source 
- Correctly remove objectives that use heart type.
- Also sends remove score packets on server switch.
- Players are only removed if Team packet mode is 4.
This commit is contained in:
Mystiflow 2017-08-04 07:10:10 +01:00 committed by md-5
parent 017f3a2424
commit 2ae8ba0afc
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/net/md_5/bungee/api/score/Objective.java
View File

@ -22,5 +22,5 @@ public class Objective
/**
* Type; integer or hearts
*/
private final String type;
private String type;
}

8
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -15,6 +15,7 @@ import net.md_5.bungee.api.event.ServerConnectedEvent;
import net.md_5.bungee.api.event.ServerKickEvent;
import net.md_5.bungee.api.event.ServerSwitchEvent;
import net.md_5.bungee.api.score.Objective;
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;
@ -37,6 +38,7 @@ import net.md_5.bungee.protocol.packet.LoginSuccess;
import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.protocol.packet.Respawn;
import net.md_5.bungee.protocol.packet.ScoreboardObjective;
import net.md_5.bungee.protocol.packet.ScoreboardScore;
import net.md_5.bungee.protocol.packet.SetCompression;
@RequiredArgsConstructor
@ -209,7 +211,11 @@ public class ServerConnector extends PacketHandler
Scoreboard serverScoreboard = user.getServerSentScoreboard();
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), "integer", (byte) 1 ) ); // TODO:
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), objective.getType(), (byte) 1 ) );
}
for ( Score score : serverScoreboard.getScores() )
{
user.unsafe().sendPacket( new ScoreboardScore( score.getItemName(), (byte) 1, score.getScoreName(), score.getValue() ) );
}
for ( Team team : serverScoreboard.getTeams() )
{

3
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -135,6 +135,7 @@ public class DownstreamBridge extends PacketHandler
if ( oldObjective != null )
{
oldObjective.setValue( objective.getValue() );
oldObjective.setType( objective.getType() );
}
break;
default:
@ -210,7 +211,7 @@ public class DownstreamBridge extends PacketHandler
if ( team.getMode() == 0 || team.getMode() == 3 )
{
t.addPlayer( s );
} else
} else if ( team.getMode() == 4 )
{
t.removePlayer( s );
}