Fix player always teleport to spawn on join.

src/main/java/fr/xephi/authme/util/TeleportationService.java

@@ -41,8 +41,12 @@ public class TeleportationService implements Reloadable {
 
     private Set<String> spawnOnLoginWorlds;
 
-    TeleportationService() { }
+    TeleportationService() {
+    }
 
+    private static boolean isEventValid(AbstractTeleportEvent event) {
+        return !event.isCancelled() && event.getTo() != null && event.getTo().getWorld() != null;
+    }
 
     @PostConstruct
     @Override
@@ -51,11 +55,9 @@ public class TeleportationService implements Reloadable {
         spawnOnLoginWorlds = new HashSet<>(settings.getProperty(RestrictionSettings.FORCE_SPAWN_ON_WORLDS));
     }
 
-    public void teleportOnJoin(final Player player) {
+    public void teleportOnLoginEvent(final Player player) {
         if (settings.getProperty(RestrictionSettings.NO_TELEPORT)) {
             return;
-        } else if (teleportToFirstSpawn(player)) {
-            return;
         }
 
         if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN) || mustForceSpawnAfterLogin(player.getWorld().getName())) {
@@ -63,6 +65,13 @@ public class TeleportationService implements Reloadable {
         }
     }
 
+    public void teleportOnJoin(final Player player) {
+        if (settings.getProperty(RestrictionSettings.NO_TELEPORT)) {
+            return;
+        }
+        teleportToFirstSpawn(player);
+    }
+
     public void teleportOnLogin(final Player player, PlayerAuth auth, LimboPlayer limbo) {
         if (settings.getProperty(RestrictionSettings.NO_TELEPORT)) {
             return;
@@ -122,7 +131,7 @@ public class TeleportationService implements Reloadable {
      * by external listeners). Note that not teleportation is performed if the event's location is empty.
      *
      * @param player the player to teleport
-     * @param event the event to emit and according to which to teleport
+     * @param event  the event to emit and according to which to teleport
      */
     private void performTeleportation(final Player player, final AbstractTeleportEvent event) {
         bukkitService.scheduleSyncDelayedTask(new Runnable() {
@@ -135,8 +144,4 @@ public class TeleportationService implements Reloadable {
             }
         });
     }
-
-    private static boolean isEventValid(AbstractTeleportEvent event) {
-        return !event.isCancelled() && event.getTo() != null && event.getTo().getWorld() != null;
-    }
 }