From 874d7cd59fc20031f6036cc0c710b2c1dae3a2fc Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Mon, 21 Dec 2015 20:20:35 +0100
Subject: [PATCH] Fix remove speed

---
 src/main/java/fr/xephi/authme/converter/SqliteToSql.java  | 2 --
 .../fr/xephi/authme/listener/AuthMePlayerListener.java    | 8 +-------
 .../fr/xephi/authme/listener/AuthMePlayerListener16.java  | 1 -
 .../fr/xephi/authme/listener/AuthMePlayerListener18.java  | 1 -
 src/main/java/fr/xephi/authme/mail/OAuth2SaslClient.java  | 5 -----
 src/main/java/fr/xephi/authme/mail/SendMailSSL.java       | 5 -----
 .../fr/xephi/authme/process/join/AsynchronousJoin.java    | 4 ++++
 7 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/converter/SqliteToSql.java b/src/main/java/fr/xephi/authme/converter/SqliteToSql.java
index c7a3790b..cb36f66e 100644
--- a/src/main/java/fr/xephi/authme/converter/SqliteToSql.java
+++ b/src/main/java/fr/xephi/authme/converter/SqliteToSql.java
@@ -1,7 +1,5 @@
 package fr.xephi.authme.converter;
 
-import java.sql.SQLException;
-
 import org.bukkit.command.CommandSender;
 
 import fr.xephi.authme.AuthMe;
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index f86be704..3899fb54 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -130,13 +130,7 @@ public class AuthMePlayerListener implements Listener {
     public void onPlayerHighChat(AsyncPlayerChatEvent event) {
         handleChat(event);
     }
-/*
- * We cannot modify this event on monitor
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-    public void onPlayerChat(AsyncPlayerChatEvent event) {
-        handleChat(event);
-    }
-*/
+
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onPlayerHighestChat(AsyncPlayerChatEvent event) {
         handleChat(event);
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
index a2e67dc9..25402c29 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener16.java
@@ -1,7 +1,6 @@
 package fr.xephi.authme.listener;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
index 0f789b5a..cfaaa65b 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener18.java
@@ -1,7 +1,6 @@
 package fr.xephi.authme.listener;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.util.Utils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/fr/xephi/authme/mail/OAuth2SaslClient.java b/src/main/java/fr/xephi/authme/mail/OAuth2SaslClient.java
index 1470e070..f6e7a5f3 100644
--- a/src/main/java/fr/xephi/authme/mail/OAuth2SaslClient.java
+++ b/src/main/java/fr/xephi/authme/mail/OAuth2SaslClient.java
@@ -15,8 +15,6 @@
 package fr.xephi.authme.mail;
 
 import java.io.IOException;
-import java.util.logging.Logger;
-
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
@@ -28,9 +26,6 @@ import javax.security.sasl.SaslException;
  * An OAuth2 implementation of SaslClient.
  */
 class OAuth2SaslClient implements SaslClient {
-  private static final Logger logger =
-      Logger.getLogger(OAuth2SaslClient.class.getName());
-
   private final String oauthToken;
   private final CallbackHandler callbackHandler;
 
diff --git a/src/main/java/fr/xephi/authme/mail/SendMailSSL.java b/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
index d2731379..3433bd14 100644
--- a/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/mail/SendMailSSL.java
@@ -11,15 +11,10 @@ import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.HtmlEmail;
 import org.bukkit.Bukkit;
 
-import com.sun.mail.smtp.SMTPTransport;
-
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
 import javax.imageio.ImageIO;
-import javax.mail.Transport;
-
 import java.io.File;
-import java.security.Provider;
 import java.security.Security;
 
 /**
diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
index dd1eb4b2..e95d3a31 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
@@ -196,6 +196,10 @@ public class AsynchronousJoin {
                     player.setAllowFlight(true);
                     player.setFlying(true);
                 }
+                if (Settings.isRemoveSpeedEnabled) {
+                    player.setFlySpeed(0.0f);
+                    player.setWalkSpeed(0.0f);
+                }
                 player.setNoDamageTicks(timeOut);
                 if (Settings.useEssentialsMotd) {
                     player.performCommand("motd");