From 3ca97f5d3060914caa8a6764dce2b7213bad93a0 Mon Sep 17 00:00:00 2001
From: sgdc3 <sgdc3.mail@gmail.com>
Date: Mon, 20 Nov 2017 13:15:20 +0100
Subject: [PATCH] #1418 Cleanup

---
 .../java/fr/xephi/authme/service/BukkitService.java | 13 +++++++++++++
 .../authme/service/bungeecord/BungeeSender.java     |  6 +-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/service/BukkitService.java b/src/main/java/fr/xephi/authme/service/BukkitService.java
index f5b03348a..6c9cd0cb8 100644
--- a/src/main/java/fr/xephi/authme/service/BukkitService.java
+++ b/src/main/java/fr/xephi/authme/service/BukkitService.java
@@ -1,5 +1,6 @@
 package fr.xephi.authme.service;
 
+import com.google.common.collect.Iterables;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.initialization.SettingsDependent;
@@ -331,6 +332,18 @@ public class BukkitService implements SettingsDependent {
         useAsyncTasks = settings.getProperty(PluginSettings.USE_ASYNC_TASKS);
     }
 
+    /**
+     * Send the specified message to bungeecord using the first available player connection.
+     *
+     * @param bytes the message
+     */
+    public void sendBungeeMessage(byte[] bytes) {
+        Player player = Iterables.getFirst(getOnlinePlayers(), null);
+        if (player != null) {
+            player.sendPluginMessage(authMe, "BungeeCord", bytes);
+        }
+    }
+
     /**
      * Method run upon initialization to verify whether or not the Bukkit implementation
      * returns the online players as a {@link Collection}.
diff --git a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java
index b268ff4c2..4394651be 100644
--- a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java
+++ b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java
@@ -1,6 +1,5 @@
 package fr.xephi.authme.service.bungeecord;
 
-import com.google.common.collect.Iterables;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import fr.xephi.authme.AuthMe;
@@ -53,10 +52,7 @@ public class BungeeSender implements SettingsDependent {
         for (String element : data) {
             out.writeUTF(element);
         }
-        Player player = Iterables.getFirst(plugin.getServer().getOnlinePlayers(), null);
-        if (player != null) {
-            player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray());
-        }
+        bukkitService.sendBungeeMessage(out.toByteArray());
     }
 
     /**