Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Remove boss bar registration system

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-27 13:18:08 +00:00
parent 404d6aa45e
commit 45f6d4b80c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/adventure/bossbar/BossBarHolder.java
View File

@ -25,16 +25,13 @@ final class BossBarHolder implements Viewable {
protected final UUID uuid = UUID.randomUUID(); protected final UUID uuid = UUID.randomUUID();
protected final Set<Player> players = new CopyOnWriteArraySet<>(); protected final Set<Player> players = new CopyOnWriteArraySet<>();
protected final BossBar bar; protected final BossBar bar;
protected boolean registered;
BossBarHolder(@NotNull BossBar bar) { BossBarHolder(@NotNull BossBar bar) {
this.bar = bar; this.bar = bar;
this.registered = false;
} }
@NotNull BossBarPacket createRemovePacket() { @NotNull BossBarPacket createRemovePacket() {
return this.createGenericPacket(REMOVE, packet -> { return this.createGenericPacket(REMOVE, packet -> { });
});
} }
@NotNull BossBarPacket createAddPacket() { @NotNull BossBarPacket createAddPacket() {

2
src/main/java/net/minestom/server/adventure/bossbar/BossBarListener.java
View File

@ -56,7 +56,7 @@ class BossBarListener implements BossBar.Listener {
private void doIfRegistered(@NotNull BossBar bar, @NotNull Consumer<BossBarHolder> consumer) { private void doIfRegistered(@NotNull BossBar bar, @NotNull Consumer<BossBarHolder> consumer) {
BossBarHolder holder = this.manager.bars.get(bar); BossBarHolder holder = this.manager.bars.get(bar);
if (holder != null && holder.registered) { if (holder != null) {
consumer.accept(holder); consumer.accept(holder);
} }
} }

25
src/main/java/net/minestom/server/adventure/bossbar/BossBarManager.java
View File

@ -58,9 +58,9 @@ public class BossBarManager {
* @param bar the boss bar to hide * @param bar the boss bar to hide
*/ */
public void removeBossBar(@NotNull Player player, @NotNull BossBar bar) { public void removeBossBar(@NotNull Player player, @NotNull BossBar bar) {
BossBarHolder holder = this.getOrCreateHandler(bar); BossBarHolder holder = this.bars.get(bar);
if (holder.removeViewer(player)) { if (holder != null && holder.removeViewer(player)) {
player.getPlayerConnection().sendPacket(holder.createRemovePacket()); player.getPlayerConnection().sendPacket(holder.createRemovePacket());
this.removePlayer(player, holder); this.removePlayer(player, holder);
} }
@ -96,18 +96,21 @@ public class BossBarManager {
* @param bar the boss bar to hide * @param bar the boss bar to hide
*/ */
public void removeBossBar(@NotNull Collection<Player> players, @NotNull BossBar bar) { public void removeBossBar(@NotNull Collection<Player> players, @NotNull BossBar bar) {
BossBarHolder holder = this.getOrCreateHandler(bar); BossBarHolder holder = this.bars.get(bar);
Collection<Player> removedPlayers = new ArrayList<>();
for (Player player : players) { if (holder != null) {
if (holder.removeViewer(player)) { Collection<Player> removedPlayers = new ArrayList<>();
removedPlayers.add(player);
this.removePlayer(player, holder); for (Player player : players) {
if (holder.removeViewer(player)) {
removedPlayers.add(player);
this.removePlayer(player, holder);
}
} }
}
if (!removedPlayers.isEmpty()) { if (!removedPlayers.isEmpty()) {
PacketUtils.sendGroupedPacket(removedPlayers, holder.createRemovePacket()); PacketUtils.sendGroupedPacket(removedPlayers, holder.createRemovePacket());
}
} }
} }