Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-07-01 09:04:56 +02:00
Code Issues Projects Releases Wiki Activity

Half revert back to storing uuids in CommonBoss

Browse Source 
Fixes #2547
This commit is contained in:
KennyTV 2021-06-14 22:47:13 +02:00
parent 7a82ded94b
commit 389c5adaa3
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/main/java/com/viaversion/viaversion/legacy/bossbar/CommonBoss.java
View File

@ -32,15 +32,14 @@ import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap;
import java.util.stream.Collectors;
public class CommonBoss implements BossBar {
private final UUID uuid;
private final Set<UserConnection> connections;
private final Map<UUID, UserConnection> connections;
private final Set<BossFlag> flags;
private String title;
private float health;
@ -57,7 +56,7 @@ public class CommonBoss implements BossBar {
this.health = health;
this.color = color == null ? BossColor.PURPLE : color;
this.style = style == null ? BossStyle.SOLID : style;
this.connections = Collections.newSetFromMap(new WeakHashMap<>());
this.connections = new WeakHashMap<>();
this.flags = new HashSet<>();
visible = true;
}
@ -101,12 +100,16 @@ public class CommonBoss implements BossBar {
@Override
public BossBar addPlayer(UUID player) {
return addConnection(Via.getManager().getConnectionManager().getConnectedClient(player));
UserConnection client = Via.getManager().getConnectionManager().getConnectedClient(player);
if (client != null) {
addConnection(client);
}
return this;
}
@Override
public BossBar addConnection(UserConnection conn) {
if (connections.add(conn) && visible) {
if (connections.put(conn.getProtocolInfo().getUuid(), conn) == null && visible) {
sendPacketConnection(conn, getPacket(CommonBoss.UpdateAction.ADD, conn));
}
return this;
@ -114,14 +117,16 @@ public class CommonBoss implements BossBar {
@Override
public BossBar removePlayer(UUID uuid) {
return removeConnection(Via.getManager().getConnectionManager().getConnectedClient(uuid));
UserConnection client = connections.remove(uuid);
if (client != null) {
sendPacketConnection(client, getPacket(UpdateAction.REMOVE, client));
}
return this;
}
@Override
public BossBar removeConnection(UserConnection conn) {
if (connections.remove(conn)) {
sendPacketConnection(conn, getPacket(UpdateAction.REMOVE, conn));
}
removePlayer(conn.getProtocolInfo().getUuid());
return this;
}
@ -153,13 +158,12 @@ public class CommonBoss implements BossBar {
@Override
public Set<UUID> getPlayers() {
return connections.stream().map(conn -> Via.getManager().getConnectionManager().getConnectedClientId(conn)).filter(Objects::nonNull)
.collect(Collectors.toSet());
return Collections.unmodifiableSet(connections.keySet());
}
@Override
public Set<UserConnection> getConnections() {
return Collections.unmodifiableSet(connections);
return Collections.unmodifiableSet(new HashSet<>(connections.values()));
}
@Override
@ -215,7 +219,7 @@ public class CommonBoss implements BossBar {
}
private void sendPacket(UpdateAction action) {
for (UserConnection conn : new ArrayList<>(connections)) {
for (UserConnection conn : new ArrayList<>(connections.values())) {
PacketWrapper wrapper = getPacket(action, conn);
sendPacketConnection(conn, wrapper);
}
@ -223,7 +227,7 @@ public class CommonBoss implements BossBar {
private void sendPacketConnection(UserConnection conn, PacketWrapper wrapper) {
if (conn.getProtocolInfo() == null || !conn.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) {
connections.remove(conn);
connections.remove(conn.getProtocolInfo().getUuid());
return;
}
try {