From 879aa24a6ef8cdc78c5b08f19cf8bb1c590bef73 Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Wed, 16 Dec 2015 22:48:06 +0100
Subject: [PATCH 1/3] Minor - fix spelling in messages return to the player

---
 .../java/fr/xephi/authme/listener/AuthMePlayerListener.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index e49215b3..337e13ec 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -229,7 +229,7 @@ public class AuthMePlayerListener implements Listener {
         if (auth != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(event.getName())) {
             event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
             event.setKickMessage("You should join using username: " + ChatColor.AQUA + auth.getRealName() +
-                ChatColor.RESET + "\nnot :" + ChatColor.RED + event.getName()); // TODO: write a better message
+                ChatColor.RESET + "\nnot: " + ChatColor.RED + event.getName()); // TODO: write a better message
             return;
         }
 
@@ -288,7 +288,7 @@ public class AuthMePlayerListener implements Listener {
                     pl.kickPlayer(m.retrieveSingle(MessageKey.KICK_FOR_VIP));
                     event.allow();
                 } else {
-                    ConsoleLogger.info("The player " + event.getPlayer().getName() + " tryed to join, but the server was full");
+                    ConsoleLogger.info("The player " + event.getPlayer().getName() + " tried to join, but the server was full");
                     event.setKickMessage(m.retrieveSingle(MessageKey.KICK_FULL_SERVER));
                     event.setResult(PlayerLoginEvent.Result.KICK_FULL);
                 }

From f1950543034369b9d54aeb5f44abb9f81717b24e Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Wed, 16 Dec 2015 23:58:21 +0100
Subject: [PATCH 2/3] Should fix the /register auto-login feature

---
 .../fr/xephi/authme/process/register/AsyncRegister.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index 668c0e3d..fb102ec9 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -141,8 +141,10 @@ public class AsyncRegister {
             return;
         }
         if (!Settings.forceRegLogin) {
-            PlayerCache.getInstance().addPlayer(auth);
-            database.setLogged(name);
+            //PlayerCache.getInstance().addPlayer(auth);
+            //database.setLogged(name);
+            // TODO: check this...
+            plugin.getManagement().performLogin(player, "dontneed", true);
         }
         plugin.otherAccounts.addPlayer(player.getUniqueId());
         ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin);

From 21d25e5ad34e23eb6078ac35a93214f3aec69f1d Mon Sep 17 00:00:00 2001
From: Xephi <xephirot59@gmail.com>
Date: Thu, 17 Dec 2015 18:56:58 +0100
Subject: [PATCH 3/3] Add email.html to resources

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index e92495db..574f362f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,14 @@
                     <include>plugin.yml</include>
                 </includes>
             </resource>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>email.html</include>
+                </includes>
+            </resource>
             <resource>
                 <targetPath>.</targetPath>
                 <filtering>false</filtering>