Fix queue xp sound

Author: AlexProgrammerDE

src/main/java/net/pistonmaster/pistonqueue/bukkit/PistonQueueBukkit.java

@@ -103,4 +103,9 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new ServerListener(this), this);
         getServer().getMessenger().registerIncomingPluginChannel(this, "piston:queue", new QueuePluginMessageListener(this));
     }
+
+    @Override
+    public void onDisable() {
+        this.getServer().getMessenger().unregisterOutgoingPluginChannel(this);
+    }
 }

src/main/java/net/pistonmaster/pistonqueue/bukkit/QueuePluginMessageListener.java

@@ -27,20 +27,40 @@
 import org.bukkit.plugin.messaging.PluginMessageListener;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 @RequiredArgsConstructor
 public final class QueuePluginMessageListener implements PluginMessageListener {
     private final PistonQueueBukkit plugin;
 
-    @SuppressWarnings("UnstableApiUsage")
     @Override
+    @SuppressWarnings("UnstableApiUsage")
     public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] message) {
         if (!channel.equals("piston:queue")) return;
 
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
         String subChannel = in.readUTF();
 
         if (plugin.isPlayXP() && subChannel.equals("xp")) {
-            player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 100.0F, 1.0F);
+            List<String> uuids = new ArrayList<>();
+            while (true) {
+                try {
+                    uuids.add(in.readUTF());
+                } catch (Exception e) {
+                    break;
+                }
+            }
+
+            for (String uuid : uuids) {
+                Player p = plugin.getServer().getPlayer(UUID.fromString(uuid));
+
+                if (p == null)
+                    continue;
+
+                p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 100.0F, 1.0F);
+            }
         }
     }
 }

src/main/java/net/pistonmaster/pistonqueue/shared/QueueListenerShared.java

@@ -254,9 +254,6 @@ protected void connectPlayer(QueueType type) {
 
             type.getQueueMap().remove(entry.getKey());
 
-            if (Config.SEND_XP_SOUND)
-                sendXPSoundToQueueType(type);
-
             player.get().sendMessage(Config.JOINING_MAIN_SERVER);
             player.get().sendPlayerListHeaderAndFooter(null, null);
 
@@ -280,6 +277,8 @@ protected void connectPlayer(QueueType type) {
 
             player.get().connect(entry.getValue());
         }
+        if (Config.SEND_XP_SOUND)
+            sendXPSoundToQueueType(type);
     }
 
     protected void sendXPSoundToQueueType(QueueType type) {
@@ -290,11 +289,12 @@ protected void sendXPSoundToQueueType(QueueType type) {
         AtomicInteger counter = new AtomicInteger(0);
         type.getQueueMap().forEach((uuid, server) -> {
             if (counter.incrementAndGet() <= 5) {
-                plugin.getPlayer(uuid).flatMap(playerWrapper ->
-                        playerWrapper.getCurrentServer().flatMap(plugin::getServer)).ifPresent(serverWrapper ->
-                        serverWrapper.sendPluginMessage("piston:queue", out.toByteArray()));
+                out.writeUTF(uuid.toString());
             }
         });
+
+        plugin.getServer(Config.QUEUE_SERVER).ifPresent(server ->
+                server.sendPluginMessage("piston:queue", out.toByteArray()));
     }
 
     protected void indexPositionTime() {