From 0c6039a773d3c7bf3c68e91ea4446483bda9dd83 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 28 Jun 2020 22:57:28 -0400 Subject: [PATCH] Make sure console is included in the ProxyServer audience --- .../main/java/com/velocitypowered/proxy/VelocityServer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java index 56815944f..eb1ee2f66 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java @@ -3,6 +3,7 @@ package com.velocitypowered.proxy; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.velocitypowered.api.event.EventManager; @@ -53,8 +54,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.security.KeyPair; +import java.util.AbstractCollection; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.Locale; import java.util.Map; import java.util.Objects; @@ -607,7 +610,8 @@ public class VelocityServer implements ProxyServer { @Override public @NonNull Iterable audiences() { - return this.getAllPlayers(); + return (Iterable) () -> Iterators.concat(Iterators.singletonIterator(console), + getAllPlayers().iterator()); } public static Gson getGsonInstance(ProtocolVersion version) {