From bc4cb5046dcaa3537832aafc4cd15deb33ddea8e Mon Sep 17 00:00:00 2001
From: Maxetto <max-8000@hotmail.it>
Date: Wed, 7 Mar 2018 19:29:24 +0100
Subject: [PATCH] Fix yet another build

---
 .../fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java   | 4 ++--
 src/main/java/fr/xephi/authme/message/Messages.java          | 2 +-
 src/main/java/fr/xephi/authme/service/CommonService.java     | 1 +
 .../fr/xephi/authme/message/MessagesIntegrationTest.java     | 5 ++++-
 src/test/resources/fr/xephi/authme/message/messages_test.yml | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java
index 2362b773..f8e2e7ba 100644
--- a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java
+++ b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java
@@ -49,9 +49,9 @@ class LimboPlayerTaskManager {
      */
     void registerMessageTask(Player player, LimboPlayer limbo, boolean isRegistered) {
         int interval = settings.getProperty(RegistrationSettings.MESSAGE_INTERVAL);
-        MessageResult messageResult = getMessageKey(player.getName(), isRegistered);
+        MessageResult result = getMessageKey(player.getName(), isRegistered);
         if (interval > 0) {
-            String[] joinMessage = messages.retrieveSingle(messageResult.messageKey, player, messageResult.args).split("\n");
+            String[] joinMessage = messages.retrieveSingle(result.messageKey, player, result.args).split("\n");
             MessageTask messageTask = new MessageTask(player, joinMessage);
             bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, interval * TICKS_PER_SECOND);
             limbo.setMessageTask(messageTask);
diff --git a/src/main/java/fr/xephi/authme/message/Messages.java b/src/main/java/fr/xephi/authme/message/Messages.java
index 4439a1b7..13017b3a 100644
--- a/src/main/java/fr/xephi/authme/message/Messages.java
+++ b/src/main/java/fr/xephi/authme/message/Messages.java
@@ -116,7 +116,7 @@ public class Messages {
      * @return The message from the file
      */
     private String retrieveMessage(MessageKey key, CommandSender sender) {
-    	String message = messagesFileHandler.getMessage(key.getKey());
+        String message = messagesFileHandler.getMessage(key.getKey());
     	String displayName = sender.getName();
     	if (sender instanceof Player) {
     		displayName = ((Player) sender).getDisplayName();
diff --git a/src/main/java/fr/xephi/authme/service/CommonService.java b/src/main/java/fr/xephi/authme/service/CommonService.java
index c95171b1..ea63c58e 100644
--- a/src/main/java/fr/xephi/authme/service/CommonService.java
+++ b/src/main/java/fr/xephi/authme/service/CommonService.java
@@ -64,6 +64,7 @@ public class CommonService {
      * Retrieves a message in one piece.
      *
      * @param key the key of the message
+     * @param sender The entity to send the message to
      * @return the message
      */
     public String retrieveSingleMessage(MessageKey key, CommandSender sender) {
diff --git a/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java b/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
index 69bbfe5d..125ad36a 100644
--- a/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
+++ b/src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
@@ -141,6 +141,7 @@ public class MessagesIntegrationTest {
         MessageKey key = MessageKey.LOGIN_SUCCESS;
         Player player = Mockito.mock(Player.class);
         given(player.getName()).willReturn("Tester");
+        given(player.getDisplayName()).willReturn("§cTesty");
 
         // when
         messages.send(player, key);
@@ -155,6 +156,7 @@ public class MessagesIntegrationTest {
         MessageKey key = MessageKey.UNKNOWN_USER;
         Player player = Mockito.mock(Player.class);
         given(player.getName()).willReturn("Tester");
+        given(player.getDisplayName()).willReturn("§cTesty");
 
         // when
         messages.send(player, key);
@@ -172,12 +174,13 @@ public class MessagesIntegrationTest {
         MessageKey key = MessageKey.REGISTER_MESSAGE;
         Player player = Mockito.mock(Player.class);
         given(player.getName()).willReturn("Tester");
+        given(player.getDisplayName()).willReturn("§cTesty");
 
         // when
         messages.send(player, key);
 
         // then
-        verify(player).sendMessage("§3Please Tester, register to the server with the command: /register <password> <ConfirmPassword>");
+        verify(player).sendMessage("§3Please Tester, register to the §cTesty§3.");
     }
 
     @Test
diff --git a/src/test/resources/fr/xephi/authme/message/messages_test.yml b/src/test/resources/fr/xephi/authme/message/messages_test.yml
index 86b38986..93287786 100644
--- a/src/test/resources/fr/xephi/authme/message/messages_test.yml
+++ b/src/test/resources/fr/xephi/authme/message/messages_test.yml
@@ -3,7 +3,7 @@
 error:
   unregistered_user: 'We''ve got%nl%new lines%nl%and '' apostrophes'
 registration:
-  register_request: '&3Please %username%, register to the server with the command: /register <password> <ConfirmPassword>'
+  register_request: '&3Please %username%, register to the %displayname%&3.'
 login:
   success: '&cHere we have&bdefined some colors &dand some other &lthings'
   wrong_password: '&cWrong password!'