Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-23 04:54:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix UpdateTeamAction

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-12-13 15:11:08 +01:00
parent 0ed847a47f
commit e28a847e73
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/network/packet/server/play/TeamsPacket.java
View File

@ -87,17 +87,14 @@ public record TeamsPacket(String teamName, Action action) implements ServerPacke
public record UpdateTeamAction(Component displayName, byte friendlyFlags,
NameTagVisibility nameTagVisibility, CollisionRule collisionRule,
NamedTextColor teamColor, Component teamPrefix, Component teamSuffix,
Collection<String> entities) implements Action {
public UpdateTeamAction {
entities = List.copyOf(entities);
}
NamedTextColor teamColor,
Component teamPrefix, Component teamSuffix) implements Action {
public UpdateTeamAction(BinaryReader reader) {
this(reader.readComponent(), reader.readByte(),
NameTagVisibility.fromIdentifier(reader.readSizedString()), CollisionRule.fromIdentifier(reader.readSizedString()),
NamedTextColor.ofExact(reader.readVarInt()), reader.readComponent(), reader.readComponent(),
reader.readVarIntList(BinaryReader::readSizedString));
NamedTextColor.ofExact(reader.readVarInt()),
reader.readComponent(), reader.readComponent());
}
@Override
@ -109,7 +106,6 @@ public record TeamsPacket(String teamName, Action action) implements ServerPacke
writer.writeVarInt(AdventurePacketConvertor.getNamedTextColorValue(teamColor));
writer.writeComponent(teamPrefix);
writer.writeComponent(teamSuffix);
writer.writeVarIntList(entities, BinaryWriter::writeSizedString);
}
@Override

2
src/main/java/net/minestom/server/scoreboard/Sidebar.java
View File

@ -434,7 +434,7 @@ public class Sidebar implements Scoreboard {
*/
private TeamsPacket updatePrefix(Component prefix) {
final var action = new TeamsPacket.UpdateTeamAction(teamDisplayName, friendlyFlags,
nameTagVisibility, collisionRule, teamColor, prefix, suffix, List.of(entityName));
nameTagVisibility, collisionRule, teamColor, prefix, suffix);
return new TeamsPacket(teamName, action);
}

2
src/main/java/net/minestom/server/scoreboard/Team.java
View File

@ -433,7 +433,7 @@ public class Team implements PacketGroupingAudience {
*/
public void sendUpdatePacket() {
final var info = new TeamsPacket.UpdateTeamAction(teamDisplayName, friendlyFlags,
nameTagVisibility, collisionRule, teamColor, prefix, suffix, members);
nameTagVisibility, collisionRule, teamColor, prefix, suffix);
PacketUtils.broadcastPacket(new TeamsPacket(teamName, info));
}