From 306160e675461fc43d38e519754710cc5c2a3d6d Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Thu, 4 Aug 2016 18:55:56 +0200
Subject: [PATCH] Revert changes to PlayerListener - This reverts the changes
 to PlayerListener.java in 5d6f3e1 to make spawn and first spawn working again

---
 .../fr/xephi/authme/listener/PlayerListener.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
index dfe733bba..ae29a5fa4 100644
--- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
@@ -193,9 +193,10 @@ public class PlayerListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerJoin(PlayerJoinEvent event) {
         final Player player = event.getPlayer();
+        teleportationService.teleportNewPlayerToFirstSpawn(player);
         management.performJoin(player);
     }
 
@@ -205,7 +206,7 @@ public class PlayerListener implements Listener {
     // event caused by "logged in from another location". The nicer way, but only for Spigot, would be
     // to check in the AsyncPlayerPreLoginEvent. To support all servers, we use the less nice way.
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerLogin(PlayerLoginEvent event) {
         final Player player = event.getPlayer();
         final String name = player.getName();
@@ -238,7 +239,6 @@ public class PlayerListener implements Listener {
         }
 
         antiBot.handlePlayerJoin(player);
-        teleportationService.teleportNewPlayerToFirstSpawn(player);
         teleportationService.teleportOnJoin(player);
     }
 
@@ -261,12 +261,10 @@ public class PlayerListener implements Listener {
     public void onPlayerKick(PlayerKickEvent event) {
         // Note #831: Especially for offline CraftBukkit, we need to catch players being kicked because of
         // "logged in from another location" and to cancel their kick
-        if(settings.getProperty(RestrictionSettings.FORCE_SINGLE_SESSION)) {
-            String reason = event.getReason();
-            if (reason.contains("You logged in from another location")) {
-                event.setCancelled(true);
-                return;
-            }
+        if (settings.getProperty(RestrictionSettings.FORCE_SINGLE_SESSION)
+            && event.getReason().contains("You logged in from another location")) {
+            event.setCancelled(true);
+            return;
         }
 
         final Player player = event.getPlayer();