Merge pull request #107 from AuthMe-Team/reload-supp

Reload supp

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

@@ -664,13 +664,19 @@ public class AuthMe extends JavaPlugin {
             inventoryProtector.unregister();
             inventoryProtector = null;
         }
-        if (tabComplete == null && newSettings.getProperty(RestrictionSettings.DENY_TABCOMPLETE_BEFORE_LOGIN)) {
+        if (newSettings.getProperty(RestrictionSettings.DENY_TABCOMPLETE_BEFORE_LOGIN) && tabComplete == null) {
             tabComplete = new AuthMeTabCompletePacketAdapter(this);
             tabComplete.register();
+        } else if (inventoryProtector != null) {
+            tabComplete.unregister();
+            tabComplete = null;
         }
-        if (tablistHider == null && newSettings.getProperty(RestrictionSettings.HIDE_TABLIST_BEFORE_LOGIN)) {
+        if (newSettings.getProperty(RestrictionSettings.HIDE_TABLIST_BEFORE_LOGIN) && tablistHider == null) {
             tablistHider = new AuthMeTablistPacketAdapter(this);
             tablistHider.register();
+        } else if (inventoryProtector != null) {
+            tablistHider.unregister();
+            tablistHider = null;
         }
     }
 

src/main/java/fr/xephi/authme/cache/backup/DataFileCache.java

@@ -1,38 +0,0 @@
-package fr.xephi.authme.cache.backup;
-
-/**
- */
-public class DataFileCache {
-
-    private final String group;
-    private final boolean operator;
-
-    /**
-     * Constructor for DataFileCache.
-     *
-     * @param group    String
-     * @param operator boolean
-     */
-    public DataFileCache(String group, boolean operator) {
-        this.group = group;
-        this.operator = operator;
-    }
-
-    /**
-     * Method getGroup.
-     *
-     * @return String
-     */
-    public String getGroup() {
-        return group;
-    }
-
-    /**
-     * Method getOperator.
-     *
-     * @return boolean
-     */
-    public boolean getOperator() {
-        return operator;
-    }
-}

src/main/java/fr/xephi/authme/cache/backup/JsonCache.java

@@ -2,7 +2,15 @@ package fr.xephi.authme.cache.backup;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.entity.Player;
@@ -11,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
 
-/**
- */
 public class JsonCache {
 
     private final Gson gson;
@@ -24,19 +30,13 @@ public class JsonCache {
             ConsoleLogger.showError("Failed to create cache directory.");
         }
         gson = new GsonBuilder()
-            .registerTypeAdapter(DataFileCache.class, new PlayerDataSerializer())
+            .registerTypeAdapter(PlayerData.class, new PlayerDataSerializer())
-            .registerTypeAdapter(DataFileCache.class, new PlayerDataDeserializer())
+            .registerTypeAdapter(PlayerData.class, new PlayerDataDeserializer())
             .setPrettyPrinting()
             .create();
     }
 
-    /**
+    public void createCache(Player player, PlayerData playerData) {
-     * Method createCache.
-     *
-     * @param player     Player
-     * @param playerData DataFileCache
-     */
-    public void createCache(Player player, DataFileCache playerData) {
         if (player == null) {
             return;
         }
@@ -65,14 +65,7 @@ public class JsonCache {
         }
     }
 
-    /**
+    public PlayerData readCache(Player player) {
-     * Method readCache.
-     *
-     * @param player Player
-     *
-     * @return DataFileCache
-     */
-    public DataFileCache readCache(Player player) {
         String path;
         try {
             path = player.getUniqueId().toString();
@@ -87,18 +80,13 @@ public class JsonCache {
 
         try {
             String str = Files.toString(file, Charsets.UTF_8);
-            return gson.fromJson(str, DataFileCache.class);
+            return gson.fromJson(str, PlayerData.class);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
     }
 
-    /**
-     * Method removeCache.
-     *
-     * @param player Player
-     */
     public void removeCache(Player player) {
         String path;
         try {
@@ -115,13 +103,6 @@ public class JsonCache {
         }
     }
 
-    /**
-     * Method doesCacheExist.
-     *
-     * @param player Player
-     *
-     * @return boolean
-     */
     public boolean doesCacheExist(Player player) {
         String path;
         try {
@@ -133,57 +114,40 @@ public class JsonCache {
         return file.exists();
     }
 
-    /**
+    private class PlayerDataDeserializer implements JsonDeserializer<PlayerData> {
-     */
-    private static class PlayerDataDeserializer implements JsonDeserializer<DataFileCache> {
-        /**
-         * Method deserialize.
-         *
-         * @param jsonElement                JsonElement
-         * @param type                       Type
-         * @param jsonDeserializationContext JsonDeserializationContext
-         *
-         * @return DataFileCache * @throws JsonParseException * @see com.google.gson.JsonDeserializer#deserialize(JsonElement, Type, JsonDeserializationContext)
-         */
         @Override
-        public DataFileCache deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+        public PlayerData deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
             JsonObject jsonObject = jsonElement.getAsJsonObject();
             if (jsonObject == null) {
                 return null;
             }
-            JsonElement e;
             String group = null;
             boolean operator = false;
+            boolean fly = false;
 
+            JsonElement e;
             if ((e = jsonObject.get("group")) != null) {
                 group = e.getAsString();
             }
             if ((e = jsonObject.get("operator")) != null) {
                 operator = e.getAsBoolean();
             }
+            if ((e = jsonObject.get("fly")) != null) {
+                fly = e.getAsBoolean();
+            }
 
-            return new DataFileCache(group, operator);
+            return new PlayerData(group, operator, fly);
         }
     }
 
-    /**
+    private class PlayerDataSerializer implements JsonSerializer<PlayerData> {
-     */
-    private class PlayerDataSerializer implements JsonSerializer<DataFileCache> {
-        /**
-         * Method serialize.
-         *
-         * @param dataFileCache            DataFileCache
-         * @param type                     Type
-         * @param jsonSerializationContext JsonSerializationContext
-         *
-         * @return JsonElement
-         */
         @Override
-        public JsonElement serialize(DataFileCache dataFileCache, Type type, JsonSerializationContext jsonSerializationContext) {
+        public JsonElement serialize(PlayerData playerData, Type type,
+                                     JsonSerializationContext jsonSerializationContext) {
             JsonObject jsonObject = new JsonObject();
-            jsonObject.addProperty("group", dataFileCache.getGroup());
+            jsonObject.addProperty("group", playerData.getGroup());
-            jsonObject.addProperty("operator", dataFileCache.getOperator());
+            jsonObject.addProperty("operator", playerData.getOperator());
-
+            jsonObject.addProperty("fly", playerData.isFlyEnabled());
             return jsonObject;
         }
     }

src/main/java/fr/xephi/authme/cache/backup/PlayerData.java

@@ -0,0 +1,26 @@
+package fr.xephi.authme.cache.backup;
+
+public class PlayerData {
+
+    private final String group;
+    private final boolean operator;
+    private final boolean flyEnabled;
+
+    public PlayerData(String group, boolean operator, boolean flyEnabled) {
+        this.group = group;
+        this.operator = operator;
+        this.flyEnabled = flyEnabled;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public boolean getOperator() {
+        return operator;
+    }
+
+    public boolean isFlyEnabled() {
+        return flyEnabled;
+    }
+}

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -1,9 +1,8 @@
 package fr.xephi.authme.cache.limbo;
 
 import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.ConsoleLogger;
-import fr.xephi.authme.cache.backup.DataFileCache;
 import fr.xephi.authme.cache.backup.JsonCache;
+import fr.xephi.authme.cache.backup.PlayerData;
 import fr.xephi.authme.permission.PermissionsManager;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -19,7 +18,7 @@ public class LimboCache {
     private volatile static LimboCache singleton;
     public final ConcurrentHashMap<String, LimboPlayer> cache;
     public final AuthMe plugin;
-    private final JsonCache playerData;
+    private final JsonCache jsonCache;
 
     /**
      * Constructor for LimboCache.
@@ -29,7 +28,7 @@ public class LimboCache {
     private LimboCache(AuthMe plugin) {
         this.plugin = plugin;
         this.cache = new ConcurrentHashMap<>();
-        this.playerData = new JsonCache();
+        this.jsonCache = new JsonCache();
     }
 
     /**
@@ -52,44 +51,28 @@ public class LimboCache {
     public void addLimboPlayer(Player player) {
         String name = player.getName().toLowerCase();
         Location loc = player.getLocation();
-        boolean operator = false;
+        boolean operator = player.isOp();
+        boolean flyEnabled = player.getAllowFlight();
         String playerGroup = "";
+        PermissionsManager permsMan = plugin.getPermissionsManager();
+        if (permsMan.hasGroupSupport()) {
+            playerGroup = permsMan.getPrimaryGroup(player);
+        }
 
-        // Get the permissions manager, and make sure it's valid
+        if (jsonCache.doesCacheExist(player)) {
-        PermissionsManager permsMan = this.plugin.getPermissionsManager();
+            PlayerData cache = jsonCache.readCache(player);
-        if (permsMan == null)
-            ConsoleLogger.showError("Unable to access permissions manager!");
-        assert permsMan != null;
-
-        if (playerData.doesCacheExist(player)) {
-            DataFileCache cache = playerData.readCache(player);
             if (cache != null) {
                 playerGroup = cache.getGroup();
                 operator = cache.getOperator();
+                flyEnabled = cache.isFlyEnabled();
             }
-        } else {
-            operator = player.isOp();
-
-            // Check whether groups are supported
-            if (permsMan.hasGroupSupport())
-                playerGroup = permsMan.getPrimaryGroup(player);
         }
 
         if (player.isDead()) {
             loc = plugin.getSpawnLocation(player);
         }
 
-        cache.put(name, new LimboPlayer(name, loc, operator, playerGroup));
+        cache.put(name, new LimboPlayer(name, loc, operator, playerGroup, flyEnabled));
-    }
-
-    /**
-     * Method addLimboPlayer.
-     *
-     * @param player Player
-     * @param group  String
-     */
-    public void addLimboPlayer(Player player, String group) {
-        cache.put(player.getName().toLowerCase(), new LimboPlayer(player.getName().toLowerCase(), group));
     }
 
     /**
@@ -99,7 +82,11 @@ public class LimboCache {
      */
     public void deleteLimboPlayer(String name) {
         checkNotNull(name);
-        cache.remove(name.toLowerCase());
+        name = name.toLowerCase();
+        if (cache.containsKey(name)) {
+            cache.get(name).clearTask();
+            cache.remove(name);
+        }
     }
 
     /**

src/main/java/fr/xephi/authme/cache/limbo/LimboPlayer.java

@@ -8,37 +8,20 @@ import org.bukkit.scheduler.BukkitTask;
 public class LimboPlayer {
 
     private final String name;
+    private final boolean fly;
     private Location loc = null;
     private BukkitTask timeoutTaskId = null;
     private BukkitTask messageTaskId = null;
     private boolean operator = false;
-    private String group = "";
+    private String group;
 
-    /**
+    public LimboPlayer(String name, Location loc, boolean operator,
-     * Constructor for LimboPlayer.
+                       String group, boolean fly) {
-     *
-     * @param name     String
-     * @param loc      Location
-     * @param operator boolean
-     * @param group    String
-     */
-    public LimboPlayer(String name, Location loc,
-                       boolean operator, String group) {
         this.name = name;
         this.loc = loc;
         this.operator = operator;
         this.group = group;
-    }
+        this.fly = fly;
-
-    /**
-     * Constructor for LimboPlayer.
-     *
-     * @param name  String
-     * @param group String
-     */
-    public LimboPlayer(String name, String group) {
-        this.name = name;
-        this.group = group;
     }
 
     /**
@@ -77,11 +60,10 @@ public class LimboPlayer {
         return group;
     }
 
-    /**
+    public boolean isFly() {
-     * Method getTimeoutTaskId.
+        return fly;
-     *
+    }
-     * @return BukkitTask
+
-     */
     public BukkitTask getTimeoutTaskId() {
         return timeoutTaskId;
     }
@@ -121,7 +103,6 @@ public class LimboPlayer {
 
     /**
      * Method clearTask.
-     *
      */
     public void clearTask() {
         if (messageTaskId != null) {

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

@@ -81,6 +81,8 @@ public class AuthMeServerListener implements Listener {
         }
         if (pluginName.equalsIgnoreCase("ProtocolLib")) {
             plugin.inventoryProtector = null;
+            plugin.tablistHider = null;
+            plugin.tabComplete = null;
             ConsoleLogger.showError("ProtocolLib has been disabled, unhook packet inventory protection!");
         }
     }

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

@@ -6,7 +6,6 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.FieldAccessException;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -18,17 +17,13 @@ public class AuthMeTabCompletePacketAdapter extends PacketAdapter {
     }
 
     @Override
-    public void onPacketReceiving(PacketEvent event)
+    public void onPacketReceiving(PacketEvent event) {
-    {
         if (event.getPacketType() == PacketType.Play.Client.TAB_COMPLETE) {
-        try
+            try {
-        {
                 if (!PlayerCache.getInstance().isAuthenticated(event.getPlayer().getName().toLowerCase())) {
                     event.setCancelled(true);
                 }
-        }
+            } catch (FieldAccessException e) {
-        catch (FieldAccessException e)
-        {
                 ConsoleLogger.showError("Couldn't access field.");
             }
         }

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

@@ -6,7 +6,6 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.FieldAccessException;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -18,17 +17,13 @@ public class AuthMeTablistPacketAdapter extends PacketAdapter {
     }
 
     @Override
-    public void onPacketSending(PacketEvent event)
+    public void onPacketSending(PacketEvent event) {
-    {
         if (event.getPacketType() == PacketType.Play.Server.PLAYER_INFO) {
-        try
+            try {
-        {
                 if (!PlayerCache.getInstance().isAuthenticated(event.getPlayer().getName().toLowerCase())) {
                     event.setCancelled(true);
                 }
-        }
+            } catch (FieldAccessException e) {
-        catch (FieldAccessException e)
-        {
                 ConsoleLogger.showError("Couldn't access field.");
             }
         }