PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3780: Allow empty scoreboard nametag visibility

Browse Source
This commit is contained in:
md_5 2025-02-08 17:55:18 +11:00
parent 05bdf5d3c1
commit cceebdad2a
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
View File

@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -66,8 +67,8 @@ public class Team extends DefinedPacket
friendlyFire = buf.readByte(); friendlyFire = buf.readByte();
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 ) if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_21_5 )
{ {
nameTagVisibility = NameTagVisibility.values()[readVarInt( buf )]; nameTagVisibility = NameTagVisibility.BY_ID[readVarInt( buf )];
collisionRule = CollisionRule.values()[readVarInt( buf )]; collisionRule = CollisionRule.BY_ID[readVarInt( buf )];
} else } else
{ {
nameTagVisibility = readStringMapKey( buf, NameTagVisibility.BY_NAME ); nameTagVisibility = readStringMapKey( buf, NameTagVisibility.BY_NAME );
@ -156,11 +157,15 @@ public class Team extends DefinedPacket
ALWAYS( "always" ), ALWAYS( "always" ),
NEVER( "never" ), NEVER( "never" ),
HIDE_FOR_OTHER_TEAMS( "hideForOtherTeams" ), HIDE_FOR_OTHER_TEAMS( "hideForOtherTeams" ),
HIDE_FOR_OWN_TEAM( "hideForOwnTeam" ); HIDE_FOR_OWN_TEAM( "hideForOwnTeam" ),
// 1.9 (and possibly other versions) appear to treat unknown values differently (always render rather than subject to spectator mode, friendly invisibles, etc).
// we allow the empty value to achieve this in case it is potentially useful even though this is unsupported and its usage may be a bug (#3780).
UNKNOWN( "" );
// //
private final String key; private final String key;
// //
private static final Map<String, NameTagVisibility> BY_NAME; private static final Map<String, NameTagVisibility> BY_NAME;
private static final NameTagVisibility[] BY_ID;
static static
{ {
@ -173,6 +178,7 @@ public class Team extends DefinedPacket
} }
BY_NAME = builder.build(); BY_NAME = builder.build();
BY_ID = Arrays.copyOf( values, values.length - 1 ); // Ignore dummy UNKNOWN value
} }
} }
@ -189,10 +195,11 @@ public class Team extends DefinedPacket
private final String key; private final String key;
// //
private static final Map<String, CollisionRule> BY_NAME; private static final Map<String, CollisionRule> BY_NAME;
private static final CollisionRule[] BY_ID;
static static
{ {
CollisionRule[] values = CollisionRule.values(); CollisionRule[] values = BY_ID = CollisionRule.values();
ImmutableMap.Builder<String, CollisionRule> builder = ImmutableMap.builderWithExpectedSize( values.length ); ImmutableMap.Builder<String, CollisionRule> builder = ImmutableMap.builderWithExpectedSize( values.length );
for ( CollisionRule e : values ) for ( CollisionRule e : values )