diff --git a/build.gradle b/build.gradle index 3db06c0..cd9fdf7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'com.pobnellion' -version = '1.0-SNAPSHOT' +version = '1.1-SNAPSHOT' repositories { mavenCentral() diff --git a/src/main/java/com/pobnellion/pobutilsVelocity/GlobalTab.java b/src/main/java/com/pobnellion/pobutilsVelocity/GlobalTab.java index f9a93c7..92b6c06 100644 --- a/src/main/java/com/pobnellion/pobutilsVelocity/GlobalTab.java +++ b/src/main/java/com/pobnellion/pobutilsVelocity/GlobalTab.java @@ -2,23 +2,17 @@ package com.pobnellion.pobutilsVelocity; import com.moandjiezana.toml.Toml; import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.connection.DisconnectEvent; -import com.velocitypowered.api.event.connection.PostLoginEvent; -import com.velocitypowered.api.event.player.ServerConnectedEvent; import com.velocitypowered.api.event.player.ServerPostConnectEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.player.TabListEntry; -import com.velocitypowered.api.proxy.server.RegisteredServer; -import com.velocitypowered.api.scheduler.Scheduler; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.standard.StandardTags; +import org.slf4j.Logger; -import java.util.Optional; import java.util.concurrent.TimeUnit; public class GlobalTab { @@ -32,29 +26,20 @@ public class GlobalTab { this.pluginInstance = pluginInstance; } -// @Subscribe -// public void onPlayerJoin(PostLoginEvent event) { -// -// } -// -// @Subscribe -// public void onPlayerLeave(DisconnectEvent event) { -// -// } - @Subscribe public void onServerConnect(ServerPostConnectEvent event) { - var entries = server.getAllPlayers().stream().map(player -> TabListEntry.builder() - .profile(player.getGameProfile()) - .displayName(formatDisplayName(player))).toList(); - server.getScheduler() - .buildTask(pluginInstance, () -> server.getAllPlayers().forEach(player -> { - player.getTabList().clearAll(); + .buildTask(pluginInstance, () -> { + var entries = server.getAllPlayers().stream().map(player -> TabListEntry.builder() + .profile(player.getGameProfile()) + .displayName(formatDisplayName(player))).toList(); + + server.getAllPlayers().forEach(player -> { player.getTabList().addEntries(entries.stream().map(entry -> - entry.tabList(player.getTabList()).build()).toList()); - })) - .delay(1, TimeUnit.SECONDS) + entry.tabList(player.getTabList()).build()).toList()); + }); + }) + .delay(2, TimeUnit.SECONDS) .schedule(); } diff --git a/src/main/java/com/pobnellion/pobutilsVelocity/PobutilsVelocity.java b/src/main/java/com/pobnellion/pobutilsVelocity/PobutilsVelocity.java index a697f7b..cd4fa09 100644 --- a/src/main/java/com/pobnellion/pobutilsVelocity/PobutilsVelocity.java +++ b/src/main/java/com/pobnellion/pobutilsVelocity/PobutilsVelocity.java @@ -49,7 +49,6 @@ public class PobutilsVelocity { if (!dataDirFile.exists()) dataDirFile.mkdir(); var configFile = new File(dataDirFile, "config.toml"); - logger.info(configFile.toPath().toString()); if (!configFile.exists()) { try {