MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

RegisteredServer and ProxyServer now implement MultiAudience

Browse Source
This commit is contained in:
Andrew Steinborn
2020-06-28 22:01:45 -04:00
parent 8ef2835a47
commit 5c02d6b007
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
View File

@@ -69,6 +69,7 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.IntFunction;
import java.util.stream.Collectors;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.text.Component;
import net.kyori.text.TextComponent;
@@ -605,11 +606,8 @@ public class VelocityServer implements ProxyServer {
}
@Override
public void sendMessage(net.kyori.adventure.text.@NonNull Component message) {
Preconditions.checkNotNull(message, "message");
for (ConnectedPlayer player : connectionsByUuid.values()) {
player.sendMessage(message);
}
public @NonNull Iterable<? extends Audience> audiences() {
return this.getAllPlayers();
}
public static Gson getGsonInstance(ProtocolVersion version) {

7
proxy/src/main/java/com/velocitypowered/proxy/server/VelocityRegisteredServer.java
View File

@@ -37,6 +37,7 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -149,9 +150,7 @@ public class VelocityRegisteredServer implements RegisteredServer {
}
@Override
public void sendMessage(@NonNull Component message) {
for (ConnectedPlayer player : players) {
player.sendMessage(message);
}
public @NonNull Iterable<? extends Audience> audiences() {
return this.getPlayersConnected();
}
}