Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

fix: Fixed NullPointerException in Player Join Listener (#47)

Browse Source
This commit is contained in:
Adrian 2023-04-21 03:30:02 -05:00 committed by GitHub
parent e422bf0840
commit 548e47f85a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/william278/velocitab/tab/PlayerTabList.java
View File

@ -27,6 +27,7 @@ import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.ServerConnection;
import com.velocitypowered.api.proxy.player.TabList; import com.velocitypowered.api.proxy.player.TabList;
import com.velocitypowered.api.proxy.player.TabListEntry; import com.velocitypowered.api.proxy.player.TabListEntry;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import com.velocitypowered.api.proxy.server.ServerInfo; import com.velocitypowered.api.proxy.server.ServerInfo;
import com.velocitypowered.api.scheduler.ScheduledTask; import com.velocitypowered.api.scheduler.ScheduledTask;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -67,7 +68,8 @@ public class PlayerTabList {
plugin.getScoreboardManager().ifPresent(manager -> manager.resetCache(joined)); plugin.getScoreboardManager().ifPresent(manager -> manager.resetCache(joined));
// Remove the player from the tracking list if they are switching servers // Remove the player from the tracking list if they are switching servers
if (event.getPreviousServer() == null) { final RegisteredServer previousServer = event.getPreviousServer();
if (previousServer == null) {
players.removeIf(player -> player.getPlayer().getUniqueId().equals(joined.getUniqueId())); players.removeIf(player -> player.getPlayer().getUniqueId().equals(joined.getUniqueId()));
} }
@ -79,7 +81,7 @@ public class PlayerTabList {
.orElse("?")); .orElse("?"));
// If the server is not in a group, use fallback. // If the server is not in a group, use fallback.
// If fallback is disabled, permit the player to switch excluded servers without header or footer override // If fallback is disabled, permit the player to switch excluded servers without header or footer override
if (serversInGroup.isEmpty() && !this.fallbackServers.contains(event.getPreviousServer().getServerInfo().getName())) { if (serversInGroup.isEmpty() && (previousServer != null && !this.fallbackServers.contains(previousServer.getServerInfo().getName()))) {
event.getPlayer().sendPlayerListHeaderAndFooter(Component.empty(), Component.empty()); event.getPlayer().sendPlayerListHeaderAndFooter(Component.empty(), Component.empty());
return; return;
} }