From 6f1af92a585baf196f68552025f3415c18ad699f Mon Sep 17 00:00:00 2001
From: DNx5 <dani.narianto@gmail.com>
Date: Sun, 15 Nov 2015 04:49:03 +0700
Subject: [PATCH] remove speed already done in join process

---
 .../authme/listener/AuthMePlayerListener.java      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index c393e509..51e1e8fb 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -130,31 +130,27 @@ public class AuthMePlayerListener implements Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onPlayerMove(PlayerMoveEvent event) {
-        if (Settings.isMovementAllowed && Settings.getMovementRadius <= 0)
+        int radius = Settings.getMovementRadius;
+        boolean allowMove = Settings.isMovementAllowed;
+        if (allowMove && radius <= 0)
             return;
 
         Player player = event.getPlayer();
         if (Utils.checkAuth(player))
             return;
 
-        if (!Settings.isMovementAllowed) {
+        if (!allowMove) {
             if (event.getFrom().distance(event.getTo()) > 0) {
-                if (Settings.isRemoveSpeedEnabled) {
-                    player.setWalkSpeed(0.0f);
-                    player.setFlySpeed(0.0f);
-                }
                 event.setTo(event.getFrom());
                 return;
             }
         }
 
-        if (Settings.getMovementRadius <= 0) {
+        if (radius <= 0) {
             return;
         }
 
-        int radius = Settings.getMovementRadius;
         Location spawn = plugin.getSpawnLocation(player);
-
         if (spawn != null && spawn.getWorld() != null) {
             if (!event.getPlayer().getWorld().equals(spawn.getWorld())) {
                 event.getPlayer().teleport(spawn);