Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-12-24 17:47:41 +01:00
Code Issues Projects Releases Wiki Activity

Dont use getters in team packet and add null check to team name

Browse Source
This commit is contained in:
md_5 2013-06-01 18:00:17 +10:00
parent 4f2b98188e
commit c5307c4451
2 changed files with 13 additions and 11 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/scoreboard/Team.java
View File

@ -5,11 +5,13 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import lombok.Data;
import lombok.NonNull;
@Data
public class Team
{
@NonNull
private final String name;
private String displayName;
private String prefix;

22
protocol/src/main/java/net/md_5/bungee/protocol/packet/PacketD1Team.java
View File

@ -64,21 +64,21 @@ public class PacketD1Team extends DefinedPacket
@Override
public void write(ByteBuf buf)
{
writeString( getName(), buf );
buf.writeByte( getMode() );
if ( getMode() == 0 || getMode() == 2 )
writeString( name, buf );
buf.writeByte( mode );
if ( mode == 0 || mode == 2 )
{
writeString( getDisplayName(), buf );
writeString( getPrefix(), buf );
writeString( getSuffix(), buf );
buf.writeBoolean( isFriendlyFire() );
writeString( displayName, buf );
writeString( prefix, buf );
writeString( suffix, buf );
buf.writeBoolean( friendlyFire );
}
if ( getMode() == 0 || getMode() == 3 || getMode() == 4 )
if ( mode == 0 || mode == 3 || mode == 4 )
{
buf.writeShort( getPlayers().length );
for ( int i = 0; i < getPlayers().length; i++ )
buf.writeShort( players.length );
for ( int i = 0; i < players.length; i++ )
{
writeString( getPlayers()[i], buf );
writeString( players[i], buf );
}
}
}