Merge remote-tracking branch 'origin/master' into jsoncache-fix

Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
	src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java

.github/ISSUE_TEMPLATE.MD

@@ -0,0 +1,25 @@
+####Before reporting an issue make sure you are running the latest build of the plugin!
+
+### What behaviour is observed:
+What happened?
+
+### What behaviour is expected:
+What did you expect?
+
+### Steps/models to reproduce:
+The actions that cause the issue
+
+### Plugin list:
+This can be found by running `/pl`
+
+### Environment description
+Standalone server/Bungeecord network, SQLite/MYSql, ...
+
+### AuthMe build number:
+This can be found by running `/authme version`
+
+### Error Log:
+Pastebin/Hastebin/Gist link of the error logo or stacktrace (if any)
+
+### COnfiguration:
+Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sesible data)

src/main/java/fr/xephi/authme/AuthMe.java

@@ -101,7 +101,6 @@ public class AuthMe extends JavaPlugin {
     // Plugin instance
     private static AuthMe plugin;
 
-    private NewAPI api;
     private Management management;
     private CommandHandler commandHandler;
     private PermissionsManager permsMan;
@@ -301,9 +300,9 @@ public class AuthMe extends JavaPlugin {
         passwordSecurity = initializer.get(PasswordSecurity.class);
         spawnLoader      = initializer.get(SpawnLoader.class);
         commandHandler   = initializer.get(CommandHandler.class);
-        api = initializer.get(NewAPI.class);
         management       = initializer.get(Management.class);
         geoLiteApi       = initializer.get(GeoLiteAPI.class);
+        initializer.get(NewAPI.class);
         initializer.get(API.class);
     }
 

src/main/java/fr/xephi/authme/ConsoleLogger.java

@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -22,7 +21,6 @@ public final class ConsoleLogger {
     private static final String NEW_LINE = System.getProperty("line.separator");
     private static final DateFormat DATE_FORMAT = new SimpleDateFormat("[MM-dd HH:mm:ss]");
     private static Logger logger;
-    private static boolean enableDebug = false;
     private static boolean useLogging = false;
     private static File logFile;
     private static FileWriter fileWriter;
@@ -40,7 +38,6 @@ public final class ConsoleLogger {
 
     public static void setLoggingOptions(NewSetting settings) {
         ConsoleLogger.useLogging = settings.getProperty(SecuritySettings.USE_LOGGING);
-        ConsoleLogger.enableDebug = !settings.getProperty(SecuritySettings.REMOVE_SPAM_FROM_CONSOLE);
         if (useLogging) {
             if (fileWriter == null) {
                 try {
@@ -67,19 +64,6 @@ public final class ConsoleLogger {
 
     }
 
-    public static void debug(String message) {
-        if (enableDebug) {
-            //creating and filling an exception is a expensive call
-            //TODO #419 20160601: ->so it should be removed as soon #419 is fixed
-            //logger.isLoggable does not work because the plugin logger is always ALL
-            logger.log(Level.FINE, message + ' ' + Thread.currentThread().getName(), new Exception());
-
-            if (useLogging) {
-                writeLog("Debug: " + Thread.currentThread().getName() + ':' + message);
-            }
-        }
-    }
-
     /**
      * Print an error message.
      *

src/main/java/fr/xephi/authme/cache/SessionManager.java

@@ -51,10 +51,9 @@ public class SessionManager implements SettingsDependent {
      * @param name The name of the player who's session to cancel.
      */
     public void cancelSession(String name) {
-        BukkitTask task = sessions.get(name);
+        BukkitTask task = sessions.remove(name);
         if (task != null) {
             task.cancel();
-            removeSession(name);
         }
     }
 

src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java

@@ -1,6 +1,5 @@
 package fr.xephi.authme.cache.auth;
 
-import fr.xephi.authme.ConsoleLogger;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -34,7 +33,6 @@ public class PlayerCache {
      * @param auth PlayerAuth
      */
     public void addPlayer(PlayerAuth auth) {
-        ConsoleLogger.debug("ADDED PLAYER TO CACHE " + auth.getNickname());
         cache.put(auth.getNickname().toLowerCase(), auth);
     }
 
@@ -44,7 +42,6 @@ public class PlayerCache {
      * @param auth PlayerAuth
      */
     public void updatePlayer(PlayerAuth auth) {
-        ConsoleLogger.debug("UPDATE PLAYER " + auth.getNickname());
         cache.put(auth.getNickname(), auth);
     }
 
@@ -54,7 +51,6 @@ public class PlayerCache {
      * @param user String
      */
     public void removePlayer(String user) {
-        ConsoleLogger.debug("REMOVE PLAYER " + user);
         cache.remove(user.toLowerCase());
     }
 

src/main/java/fr/xephi/authme/datasource/CacheDataSource.java

@@ -54,7 +54,6 @@ public class CacheDataSource implements DataSource {
                     return executorService.submit(new Callable<Optional<PlayerAuth>>() {
                         @Override
                         public Optional<PlayerAuth> call() {
-                            ConsoleLogger.debug("REFRESH " + key);
                             return load(key);
                         }
                     });

src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java

@@ -3,7 +3,6 @@ package fr.xephi.authme.hooks;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
 
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.SessionManager;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -30,12 +29,6 @@ public class BungeeCordMessage implements PluginMessageListener {
     @Inject
     private PlayerCache playerCache;
     
-    @Inject
-    private SessionManager sessionManager;
-
-    @Inject
-    private AuthMe plugin;
-    
     @Inject
     private NewSetting settings;
 
@@ -64,11 +57,6 @@ public class BungeeCordMessage implements PluginMessageListener {
                     if ("login".equals(act)) {
                         playerCache.updatePlayer(auth);
                         dataSource.setLogged(name);
-                        //START 03062016 sgdc3: should fix #731 but we need to recode this mess
-                        if (sessionManager.hasSession(name)) {
-                            sessionManager.cancelSession(name);
-                        }
-                        //END
 
                         if (!settings.getProperty(SecuritySettings.REMOVE_SPAM_FROM_CONSOLE)) {
                             ConsoleLogger.info("Player " + auth.getNickname() + " has logged in from one of your server!");
@@ -76,6 +64,7 @@ public class BungeeCordMessage implements PluginMessageListener {
                     } else if ("logout".equals(act)) {
                         playerCache.removePlayer(name);
                         dataSource.setUnlogged(name);
+
                         if (!settings.getProperty(SecuritySettings.REMOVE_SPAM_FROM_CONSOLE)) {
                             ConsoleLogger.info("Player " + auth.getNickname() + " has logged out from one of your server!");
                         }

src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java

@@ -1,6 +1,5 @@
 package fr.xephi.authme.listener;
 
-import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.hooks.PluginHooks;
 import fr.xephi.authme.listener.protocollib.ProtocolLibService;
@@ -24,8 +23,6 @@ import javax.inject.Inject;
  */
 public class AuthMeServerListener implements Listener {
 
-    @Inject
-    private AuthMe plugin;
     @Inject
     private Messages messages;
     @Inject

src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java

@@ -25,12 +25,9 @@ import com.comphenix.protocol.events.PacketEvent;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.settings.Settings;
-import org.apache.commons.lang.reflect.MethodUtils;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.logging.Level;
@@ -44,10 +41,6 @@ public class AuthMeInventoryPacketAdapter extends PacketAdapter {
     private static final int ARMOR_SIZE = 4;
     private static final int MAIN_SIZE = 27;
     private static final int HOTBAR_SIZE = 9;
-    private static final int OFF_HAND_POSITION = 45;
-
-    private final boolean offHandSupported = MethodUtils
-            .getAccessibleMethod(PlayerInventory.class, "getItemInOffHand", new Class[]{}) != null;
 
     public AuthMeInventoryPacketAdapter(AuthMe plugin) {
         super(plugin, PacketType.Play.Server.SET_SLOT, PacketType.Play.Server.WINDOW_ITEMS);

src/main/java/fr/xephi/authme/permission/handlers/PermissionHandlerException.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.permission.handlers;
 /**
  * Exception during the instantiation of a {@link PermissionHandler}.
  */
+@SuppressWarnings("serial")
 public class PermissionHandlerException extends Exception {
 
     public PermissionHandlerException(String message) {

src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -142,10 +142,9 @@ public class AsynchronousJoin implements AsynchronousProcess {
             }
 
             // Session logic
-            if (service.getProperty(PluginSettings.SESSIONS_ENABLED) && (playerCache.isAuthenticated(name) || database.isLogged(name))) {
+            if (service.getProperty(PluginSettings.SESSIONS_ENABLED) && (sessionManager.hasSession(name) || database.isLogged(name))) {
-                if (sessionManager.hasSession(name)) {
                 sessionManager.cancelSession(name);
-                }
+
                 PlayerAuth auth = database.getAuth(name);
                 database.setUnlogged(name);
                 playerCache.removePlayer(name);

src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java

@@ -10,7 +10,7 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.process.AsynchronousProcess;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.process.SyncProcessManager;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.Utils;
 import org.bukkit.Location;
@@ -81,17 +81,16 @@ public class AsynchronousQuit implements AsynchronousProcess {
                     postLogout(name);
                 }
 
-                }, Settings.getSessionTimeout * TICKS_PER_MINUTE);
+            }, service.getProperty(PluginSettings.SESSIONS_TIMEOUT) * TICKS_PER_MINUTE);
 
             sessionManager.addSession(name, task);
         } else {
             //plugin is disabled; we cannot schedule more tasks so run it directly here
             postLogout(name);
         }
-        } else {
+
-            playerCache.removePlayer(name);
+        //always update the database when the player quit the game
         database.setUnlogged(name);
-        }
 
         if (plugin.isEnabled()) {
             syncProcessManager.processSyncPlayerQuit(player);
@@ -103,8 +102,6 @@ public class AsynchronousQuit implements AsynchronousProcess {
     }
 
     private void postLogout(String name) {
-        PlayerCache.getInstance().removePlayer(name);
-        database.setUnlogged(name);
         sessionManager.removeSession(name);
     }
 }

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${bukkitplugin.authors}]
 website: ${project.url}
 description: ${project.description}
 main: ${bukkitplugin.main}
-version: ${bukkitplugin.versionCode}
+version: ${bukkitplugin.version}
 softdepend:
     - Vault
     - PermissionsBukkit