Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 0ba47b8

Browse files
committed
remove waterfall-only method
fixes #75
1 parent 3c57554 commit 0ba47b8

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ plugins {
44
}
55

66
group 'com.danifoldi'
7-
version '1.2.5'
7+
version '1.2.6'
88
sourceCompatibility = JavaVersion.VERSION_11
9+
targetCompatibility = JavaVersion.VERSION_11
910

1011
repositories {
1112
mavenCentral()

src/main/java/com/danifoldi/bungeegui/command/PluginCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull String[]
289289
case "p":
290290
return List.of(ProxyServer.getInstance().getPlayer(target.getSecond()));
291291
case "s":
292-
return ProxyServer.getInstance().getServersCopy().get(target.getSecond()).getPlayers();
292+
return ProxyServer.getInstance().getServers().get(target.getSecond()).getPlayers();
293293
default:
294294
return Collections.emptyList();
295295
}

src/main/java/com/danifoldi/bungeegui/inject/BungeeGuiComponent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.md_5.bungee.api.ProxyServer;
88
import net.md_5.bungee.api.plugin.PluginManager;
99
import net.md_5.bungee.api.scheduler.TaskScheduler;
10-
import org.intellij.lang.annotations.MagicConstant;
1110
import org.jetbrains.annotations.NotNull;
1211

1312
import javax.inject.Singleton;

src/main/java/com/danifoldi/bungeegui/main/GuiHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.danifoldi.bungeegui.util.StringUtil;
1212
import com.electronwill.nightconfig.core.Config;
1313
import com.electronwill.nightconfig.core.EnumGetMethod;
14-
import dagger.Module;
1514
import de.exceptionflug.protocolize.inventory.Inventory;
1615
import de.exceptionflug.protocolize.inventory.InventoryModule;
1716
import de.exceptionflug.protocolize.items.ItemStack;

src/main/java/com/danifoldi/bungeegui/main/PlaceholderHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void unregisterAll() {
107107
void registerBuiltins() {
108108
final @NotNull ConcurrentMap<ServerInfo, Boolean> lastStatus = new ConcurrentHashMap<>();
109109
refreshData = proxyServer.getScheduler().schedule(plugin, () -> {
110-
for (ServerInfo server: proxyServer.getServersCopy().values()) {
110+
for (ServerInfo server: Map.copyOf(proxyServer.getServers()).values()) {
111111
server.ping((ping, error) -> {
112112
if (lastStatus.containsKey(server) && lastStatus.get(server) != (error == null)) {
113113
if (error != null) {
@@ -149,7 +149,7 @@ void registerBuiltins() {
149149
return String.valueOf(count);
150150
});
151151
registerBuiltin("guicount", player -> String.valueOf(BungeeGuiAPI.getInstance().getAvailableGuis().size()));
152-
registerBuiltin("servercount", player -> String.valueOf(proxyServer.getServersCopy().size()));
152+
registerBuiltin("servercount", player -> String.valueOf(proxyServer.getServers().size()));
153153
registerBuiltin("plugincount", player -> String.valueOf(pluginManager.getPlugins().size()));
154154
registerBuiltin("placeholdercount", player -> String.valueOf(placeholders.size() + builtinPlaceholders.size()));
155155
registerBuiltin("displayname", player -> {
@@ -318,7 +318,7 @@ void registerBuiltins() {
318318
}
319319
});
320320

321-
for (Map.Entry<String, ServerInfo> server: proxyServer.getServersCopy().entrySet()) {
321+
for (Map.Entry<String, ServerInfo> server: Map.copyOf(proxyServer.getServers()).entrySet()) {
322322
registerBuiltin("status@" + server.getKey(), player -> {
323323
final boolean online = lastStatus.get(server.getValue());
324324
return online ? "Online" : "Offline";

0 commit comments

Comments
 (0)