Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-24 00:51:34 +01:00
Code Issues Projects Releases Wiki Activity

Unimplement Audience in ConnectionManager

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-26 11:15:08 +00:00
parent 7afca9554d
commit 73ab9a7c21
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minestom/server/network/ConnectionManager.java
View File

@ -40,7 +40,7 @@ import java.util.function.Predicate;
/**
* Manages the connected clients.
*/
public final class ConnectionManager implements PacketGroupingAudience {
public final class ConnectionManager {
private static final long KEEP_ALIVE_DELAY = 10_000;
private static final long KEEP_ALIVE_KICK = 30_000;
@ -152,12 +152,10 @@ public final class ConnectionManager implements PacketGroupingAudience {
*/
@Deprecated
public void broadcastMessage(@NotNull JsonMessage jsonMessage, @Nullable PlayerValidator condition) {
final Collection<Player> recipients = getRecipients(condition);
if (!recipients.isEmpty()) {
for (Player recipient : recipients) {
recipient.sendMessage(jsonMessage);
}
if (condition == null) {
Audiences.audiences().players().sendMessage(jsonMessage);
} else {
Audiences.audiences().players(condition).sendMessage(jsonMessage);
}
}
@ -165,11 +163,11 @@ public final class ConnectionManager implements PacketGroupingAudience {
* Sends a {@link JsonMessage} to all online players.
*
* @param jsonMessage the message to send, probably a {@link net.minestom.server.chat.ColoredText} or {@link net.minestom.server.chat.RichMessage}
* @deprecated Use {@link #sendMessage(Component)}
* @deprecated Use {@link Audience#sendMessage(Component)} on {@link Audiences#players()}
*/
@Deprecated
public void broadcastMessage(@NotNull JsonMessage jsonMessage) {
this.sendMessage(jsonMessage);
this.broadcastMessage(jsonMessage, null);
}
private Collection<Player> getRecipients(@Nullable PlayerValidator condition) {
@ -555,9 +553,4 @@ public final class ConnectionManager implements PacketGroupingAudience {
public void addWaitingPlayer(@NotNull Player player) {
this.waitingPlayers.add(player);
}
@Override
public @NotNull Collection<Player> getPlayers() {
return this.getOnlinePlayers();
}
}