Add support for not temporal whitelist

voidpointer0x00 · Jan 4, 2019 · ddf5731 · ddf5731
1 parent 632cec5
commit ddf5731
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/messages.yml b/messages.yml
@@ -15,9 +15,12 @@ add-usage: "§eCorrect usage: §c/whitelist add §f[§cplayer]§f §f[§ctime di
 remove-usage: "§eCorrect usage: §c/whitelist remove §f[§cplayer]§f"
 # displays if successfuly added player from whitelist
 # %player% for add player name; %until% for add until string
-added-successfuly: "§aSuccessfuly added %player% to whitelist until %until%"
+added-successfuly-until: "§aSuccessfuly added %player% to whitelist until %until%"
+# displays if successfuly added player from whitelist
+# %player% for add player name
+added-successfuly: "§aSuccessfuly added %player% to whitelist"
 # displays if successfuly removed player from whitelist
 # %player% for add player name
 removed-successfuly: "§aSuccessfuly removed %player% form whitelist"
 # displays if plugin reloaded
-reloaded: "§aSuccessfuly reloaded plugin"
+reloaded: "§aSuccessfuly reloaded plugin"
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: TemporalWhitelist
 main: me.nyanguymf.TemporalWhitelist
-version: 1
+version: 1.1
 author: NyanGuyMF
 
 commands:

diff --git a/src/me/nyanguymf/Whitelist.java b/src/me/nyanguymf/Whitelist.java
@@ -44,17 +44,15 @@ public boolean isEnabled() {
     }
 
     public boolean isWhitelisted(String name) {
-        if (!tw.getPlayerCfg(name).contains("whitelisted")) {
+        if (!tw.getPlayerCfg(name).contains("whitelisted"))
             return false;
-        }
 
-        if (!tw.getPlayerCfg(name).getBoolean("whitelisted")) {
+        if (!tw.getPlayerCfg(name).getBoolean("whitelisted"))
             return false;
-        }
 
-        if (tw.getPlayerCfg(name).getLong("until") - System.currentTimeMillis() / 1000L <= 0) {
-            return false;
-        }
+        if (tw.getPlayerCfg(name).isSet("until"))
+            if (tw.getPlayerCfg(name).getLong("until") - System.currentTimeMillis() / 1000L <= 0)
+                return false;
 
         return true;
     }
@@ -64,13 +62,31 @@ public void add(CommandSender sender, String name, String timeDiff) {
             long until = DateUtils.parseDateDiff(timeDiff, true);
 
             FileConfiguration playerYml = tw.getPlayerCfg(name);
+
             playerYml.set("whitelisted", true);
             playerYml.set("until", until);
             playerYml.save(new File(tw.getDataFolder() + File.separator + "players", name + ".yml"));
 
+            String  added   = TemporalWhitelist.getMessage("added-successfuly-until");
+                    added   = added.replaceAll("%player%", name); 
+                    added   = added.replaceAll("%until%", new Date(until).toString());
+
+            sender.sendMessage(added);
+        } catch (Exception e) {
+            e.printStackTrace();
+            sender.sendMessage(e.getMessage());
+        }
+    }
+
+    public void add(CommandSender sender, String name) {
+        try {
+            FileConfiguration playerYml = tw.getPlayerCfg(name);
+
+            playerYml.set("whitelisted", true);
+            playerYml.save(new File(tw.getDataFolder() + File.separator + "players", name + ".yml"));
+
             String  added   = TemporalWhitelist.getMessage("added-successfuly");
                     added   = added.replaceAll("%player%", name); 
-                    added   = added.replaceAll("%until%", new Date(until * 1000).toString());
 
             sender.sendMessage(added);
         } catch (Exception e) {

diff --git a/src/me/nyanguymf/commands/WhitelistCommand.java b/src/me/nyanguymf/commands/WhitelistCommand.java
@@ -31,12 +31,15 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         }
 
         if (args[0].equalsIgnoreCase("add")) {
-            if (args.length < 3) {
+            if (args.length < 2) {
                 sender.sendMessage(TemporalWhitelist.getMessage("add-usage"));
                 return true;
             }
 
-            wh.add(sender, args[1], args[2]);
+            if (args.length == 2)
+                wh.add(sender, args[1]);
+            else if (args.length >= 3)
+                wh.add(sender, args[1], args[2]);
             return true;
         }
 

diff --git a/src/me/nyanguymf/listeners/LoginListener.java b/src/me/nyanguymf/listeners/LoginListener.java
@@ -34,7 +34,6 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
         String playerName = event.getName();
 
         if (!wh.isWhitelisted(playerName)) {
-            // TODO add config for messaging
             event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_WHITELIST, TemporalWhitelist.getMessage("not-whitelisted"));
             return;
         }