From 89a11c176bdf581f2ce0cf7883993180a8415471 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Thu, 29 Jun 2023 20:10:30 -0500 Subject: [PATCH] Fixed QueueScoreboardActivator not activating on the correct player --- .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 2 +- spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 4426d6c..ba04942 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -481,7 +481,7 @@ public class QueueManagerImpl implements QueueManager { } for (QueueServer s : servers) { for (QueuePlayer queuePlayer : s.getQueue()) { - AdaptedPlayer player = queuePlayer.getPlayer(); + AdaptedPlayer player = queuePlayer.getPlayer(); if (player == null || !player.isConnected()) continue; if(player.getServerName() == null) continue; main.getPlatformMethods().sendPluginMessage(player, "inqueueevent", "true"); diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java index abde51e..63257aa 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java @@ -110,10 +110,7 @@ public class SpigotMain extends JavaPlugin implements PluginMessageListener,List } if(subchannel.equals("inqueueevent")) { - String playername = in.readUTF(); - Player p = Bukkit.getPlayer(playername); - if(p == null) return; - QueueScoreboardActivator e = new QueueScoreboardActivator(p); + QueueScoreboardActivator e = new QueueScoreboardActivator(player); Bukkit.getPluginManager().callEvent(e); return; }