fix queueevent message attempting to be send when the player is not connected

This commit is contained in:
ajgeiss0702
2021-12-11 10:47:26 -07:00
parent bce37cb278
commit fd7f16189c
2 changed files with 2 additions and 1 deletions
@@ -433,6 +433,7 @@ public class QueueManagerImpl implements QueueManager {
for (QueuePlayer queuePlayer : s.getQueue()) { for (QueuePlayer queuePlayer : s.getQueue()) {
AdaptedPlayer player = queuePlayer.getPlayer(); AdaptedPlayer player = queuePlayer.getPlayer();
if (player == null || !player.isConnected()) continue; if (player == null || !player.isConnected()) continue;
if(player.getServerName() == null) continue;
main.getPlatformMethods().sendPluginMessage(player, "inqueueevent", "true"); main.getPlatformMethods().sendPluginMessage(player, "inqueueevent", "true");
} }
} }
@@ -106,7 +106,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience {
@Override @Override
public String getServerName() { public String getServerName() {
Optional<ServerConnection> serverConnection = handle.getCurrentServer(); Optional<ServerConnection> serverConnection = handle.getCurrentServer();
if(!serverConnection.isPresent()) return "none"; if(!serverConnection.isPresent()) return null;
ServerConnection connection = serverConnection.get(); ServerConnection connection = serverConnection.get();
return connection.getServerInfo().getName(); return connection.getServerInfo().getName();
} }