From 4b67cf961ccc8980e3e468140d8e2d8e65b7f078 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sun, 20 Sep 2015 17:21:49 +0200
Subject: [PATCH] fix speed remover

---
 src/main/java/fr/xephi/authme/AuthMe.java                      | 1 -
 .../java/fr/xephi/authme/listener/AuthMeChestShopListener.java | 3 ---
 .../java/fr/xephi/authme/process/join/AsyncronousJoin.java     | 2 +-
 .../authme/process/logout/ProcessSyncronousPlayerLogout.java   | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 737299d4..170e6d7d 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -47,7 +47,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
-import java.util.zip.GZIPInputStream;
 
 public class AuthMe extends JavaPlugin {
 
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java
index cf551a63..476f2586 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java
@@ -4,9 +4,6 @@ import com.Acrobot.ChestShop.Events.PreTransactionEvent;
 import com.Acrobot.ChestShop.Events.PreTransactionEvent.TransactionOutcome;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.Utils;
-import fr.xephi.authme.cache.auth.PlayerCache;
-import fr.xephi.authme.settings.Settings;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index 0302e06f..4df4928e 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -223,7 +223,7 @@ public class AsyncronousJoin {
                     player.performCommand("motd");
                 if (Settings.applyBlindEffect)
                     player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Settings.getRegistrationTimeout * 20, 2));
-                if (!Settings.isMovementAllowed) {
+                if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
                     player.setWalkSpeed(0.0f);
                     player.setFlySpeed(0.0f);
                 }
diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
index e2a96b0e..e9efd847 100644
--- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
+++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
@@ -54,7 +54,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable {
         if (!Settings.isMovementAllowed) {
             player.setAllowFlight(true);
             player.setFlying(true);
-            if (Settings.isRemoveSpeedEnabled) {
+            if (!Settings.isMovementAllowed && Settings.isRemoveSpeedEnabled) {
                 player.setFlySpeed(0.0f);
                 player.setWalkSpeed(0.0f);
             }