From b2359280894ef51bdee882c693fa6ee0247d44a1 Mon Sep 17 00:00:00 2001
From: Sti-jn <teriuihi@alttd.com>
Date: Sun, 4 Apr 2021 19:24:43 +0200
Subject: [PATCH] Re-did formatting, removed some unused code and rewrote some
 excessive if statements

---
 .../java/com/liteflags/auth/AuthTimer.java    |  70 +--
 .../com/liteflags/auth/Authentication.java    |  38 +-
 .../java/com/liteflags/commands/AuthCMD.java  |   4 -
 .../java/com/liteflags/commands/FlagCMD.java  | 464 +++++++++---------
 src/main/java/com/liteflags/data/Data.java    |   4 -
 .../com/liteflags/data/database/Database.java | 379 +++++++-------
 .../data/database/DatabaseConnection.java     |  65 +--
 .../com/liteflags/data/database/Methods.java  | 165 +++----
 .../com/liteflags/data/maps/MapCache.java     |   4 +-
 .../java/com/liteflags/events/ChatEvent.java  |  78 +--
 .../java/com/liteflags/events/LoginEvent.java |  40 +-
 .../com/liteflags/events/LogoutEvent.java     |  35 +-
 .../java/com/liteflags/events/MoveEvent.java  |  22 +-
 .../java/com/liteflags/util/Utilities.java    | 125 ++---
 14 files changed, 724 insertions(+), 769 deletions(-)
 delete mode 100644 src/main/java/com/liteflags/commands/AuthCMD.java
 delete mode 100644 src/main/java/com/liteflags/data/Data.java

diff --git a/src/main/java/com/liteflags/auth/AuthTimer.java b/src/main/java/com/liteflags/auth/AuthTimer.java
index a3ad44a..ae9d747 100644
--- a/src/main/java/com/liteflags/auth/AuthTimer.java
+++ b/src/main/java/com/liteflags/auth/AuthTimer.java
@@ -3,51 +3,53 @@ package com.liteflags.auth;
 import com.liteflags.LiteFlags;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class AuthTimer<taskID> {
-   public LiteFlags flags;
-   public static Map<UUID, Integer> taskID = new HashMap();
+    public LiteFlags flags;
+    public static Map<UUID, Integer> taskID = new HashMap();
 
-   public AuthTimer(LiteFlags flags) {
-      this.flags = flags;
-   }
+    public AuthTimer(LiteFlags flags) {
+        this.flags = flags;
+    }
 
-   public static void startTimer(final Player player) {
-      int tid = LiteFlags.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(LiteFlags.getInstance(), new Runnable() {
-         int timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
+    public static void startTimer(final Player player) {
+        int tid = LiteFlags.getInstance().getServer().getScheduler().scheduleSyncRepeatingTask(LiteFlags.getInstance(), new Runnable() {
+            int timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
+
+            public void run() {
+                if (this.timeRemaining <= 0) {
+                    if (player.hasPermission("liteflags.authentication.success")) {
+                        AuthTimer.endTask(player);
+                    } else {
+                        player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+                        Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
+                        this.timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
+                    }
+                } else if (player.hasPermission("liteflags.authentication.success")) {
+                    AuthTimer.endTask(player);
+                } else {
+                    --this.timeRemaining;
+                }
 
-         public void run() {
-            if (this.timeRemaining <= 0) {
-               if (player.hasPermission("liteflags.authentication.success")) {
-                  AuthTimer.endTask(player);
-               } else {
-                  player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
-                  Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
-                  this.timeRemaining = LiteFlags.getInstance().getConfig().getInt("Authenticate_Timer");
-               }
-            } else if (player.hasPermission("liteflags.authentication.success")) {
-               AuthTimer.endTask(player);
-            } else {
-               --this.timeRemaining;
             }
+        }, 0L, 20L);
+        Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
+        taskID.put(player.getUniqueId(), tid);
+    }
 
-         }
-      }, 0L, 20L);
-      Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Authenticate_Timer_Command").replace("%player%", player.getName()).replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString())));
-      taskID.put(player.getUniqueId(), tid);
-   }
+    public static void endTask(Player player) {
+        if (taskID.containsKey(player.getUniqueId())) {
+            int tid = taskID.get(player.getUniqueId());
+            LiteFlags.getInstance().getServer().getScheduler().cancelTask(tid);
+            taskID.remove(player.getUniqueId());
+        }
 
-   public static void endTask(Player player) {
-      if (taskID.containsKey(player.getUniqueId())) {
-         int tid = taskID.get(player.getUniqueId());
-         LiteFlags.getInstance().getServer().getScheduler().cancelTask(tid);
-         taskID.remove(player.getUniqueId());
-      }
-
-   }
+    }
 }
diff --git a/src/main/java/com/liteflags/auth/Authentication.java b/src/main/java/com/liteflags/auth/Authentication.java
index a8f1ef1..d643960 100644
--- a/src/main/java/com/liteflags/auth/Authentication.java
+++ b/src/main/java/com/liteflags/auth/Authentication.java
@@ -3,32 +3,34 @@ package com.liteflags.auth;
 import com.liteflags.LiteFlags;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
+
 import java.util.Random;
 import java.util.UUID;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class Authentication {
-   public static String getAuthKey() {
-      String randChars = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789abcdefghijklmnopqrstuvwsyz";
-      StringBuilder salt = new StringBuilder();
-      Random rnd = new Random();
+    public static String getAuthKey() {
+        String randChars = "ABCDEFGHIJKLMNPQRSTUVWXYZ123456789abcdefghijklmnopqrstuvwsyz";
+        StringBuilder salt = new StringBuilder();
+        Random rnd = new Random();
 
-      while(salt.length() < 6) {
-         int index = (int)(rnd.nextFloat() * (float)randChars.length());
-         salt.append(randChars.charAt(index));
-      }
+        while (salt.length() < 6) {
+            int index = (int) (rnd.nextFloat() * (float) randChars.length());
+            salt.append(randChars.charAt(index));
+        }
 
-      return "." + salt.toString();
-   }
+        return "." + salt.toString();
+    }
 
-   public static void checkAuthStatus(UUID uuid) {
-      Player player = Bukkit.getPlayer(uuid);
-      if (!player.hasPermission("liteflags.authentication.success")) {
-         MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
-         AuthTimer.startTimer(player);
-         player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
-      }
+    public static void checkAuthStatus(UUID uuid) {
+        Player player = Bukkit.getPlayer(uuid);
+        if (!player.hasPermission("liteflags.authentication.success")) {
+            MapCache.reauthedPlayers.put(player.getUniqueId().toString(), getAuthKey());
+            AuthTimer.startTimer(player);
+            player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+        }
 
-   }
+    }
 }
diff --git a/src/main/java/com/liteflags/commands/AuthCMD.java b/src/main/java/com/liteflags/commands/AuthCMD.java
deleted file mode 100644
index 1fa92f9..0000000
--- a/src/main/java/com/liteflags/commands/AuthCMD.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.liteflags.commands;
-
-public class AuthCMD {
-}
diff --git a/src/main/java/com/liteflags/commands/FlagCMD.java b/src/main/java/com/liteflags/commands/FlagCMD.java
index e1788db..e8e246d 100644
--- a/src/main/java/com/liteflags/commands/FlagCMD.java
+++ b/src/main/java/com/liteflags/commands/FlagCMD.java
@@ -5,12 +5,14 @@ import com.liteflags.data.database.Database;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
@@ -25,259 +27,257 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class FlagCMD implements CommandExecutor {
-   private LiteFlags flags;
+    private LiteFlags flags;
 
-   public FlagCMD(LiteFlags flags) {
-      this.flags = flags;
-   }
+    public FlagCMD(LiteFlags flags) {
+        this.flags = flags;
+    }
 
-   public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-      OfflinePlayer target;
-      String removeTimeLetter;
-      if (cmd.getName().equalsIgnoreCase("flag") && sender instanceof Player) {
-         if (sender.hasPermission("liteflags.staff")) {
-            if (args.length == 0) {
-               sender.sendMessage(ChatColor.RED + "Invalid command. /flag help");
-            }
+    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+        OfflinePlayer target;
+        String removeTimeLetter;
+        if (cmd.getName().equalsIgnoreCase("flag") && sender instanceof Player) {
+            if (sender.hasPermission("liteflags.staff")) {
+                if (args.length == 0) {
+                    sender.sendMessage(ChatColor.RED + "Invalid command. /flag help");
+                }
 
-            if (args.length == 1 && args[0].equalsIgnoreCase("help")) {
-               sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl " + ChatColor.GRAY + "- Shows all the players with active flags");
-               sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl <player> " + ChatColor.GRAY + "- Shows all flags a player has");
-               sender.sendMessage(ChatColor.YELLOW + "/flag <player> <time> <reason> " + ChatColor.GRAY + "- This will flag a player for a given reason. Ex: /flag BobTheBuilder 7d Possible hacked client.");
-            }
+                if (args.length == 1 && args[0].equalsIgnoreCase("help")) {
+                    sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl " + ChatColor.GRAY + "- Shows all the players with active flags");
+                    sender.sendMessage(ChatColor.YELLOW + "/flaglist | /fl <player> " + ChatColor.GRAY + "- Shows all flags a player has");
+                    sender.sendMessage(ChatColor.YELLOW + "/flag <player> <time> <reason> " + ChatColor.GRAY + "- This will flag a player for a given reason. Ex: /flag BobTheBuilder 7d Possible hacked client.");
+                }
 
-            if (args.length >= 2) {
-               if (args[0].equalsIgnoreCase("remove")) {
-                  if (sender.hasPermission("liteflags.removeflags")) {
-                     target = Bukkit.getServer().getOfflinePlayer(args[2]);
-                     int id = Integer.parseInt(args[1]);
-                     if (args.length == 4) {
-                        if (!args[3].isEmpty() && args[3].equalsIgnoreCase("-c") && Database.hasFlags(target.getUniqueId())) {
-                           sender.sendMessage(ChatColor.GRAY + "You have successfully removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + ChatColor.YELLOW + target.getName() + "'s" + ChatColor.GRAY + " flag history.");
-                           LiteFlags.getInstance().getLogger().info(sender.getName() + " has removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + target.getName() + "'s flag history.");
-                           Database.removeFlag(target.getUniqueId(), id);
+                if (args.length >= 2) {
+                    if (args[0].equalsIgnoreCase("remove")) {
+                        if (sender.hasPermission("liteflags.removeflags")) {
+                            target = Bukkit.getServer().getOfflinePlayer(args[2]);
+                            int id = Integer.parseInt(args[1]);
+                            if (args.length == 4) {
+                                if (!args[3].isEmpty() && args[3].equalsIgnoreCase("-c") && Database.hasFlags(target.getUniqueId())) {
+                                    sender.sendMessage(ChatColor.GRAY + "You have successfully removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + ChatColor.YELLOW + target.getName() + "'s" + ChatColor.GRAY + " flag history.");
+                                    LiteFlags.getInstance().getLogger().info(sender.getName() + " has removed the flag '" + Database.getFlagReason(target.getUniqueId(), id) + "' from " + target.getName() + "'s flag history.");
+                                    Database.removeFlag(target.getUniqueId(), id);
+                                }
+                            } else if (args.length == 3) {
+                                Utilities.sendFlagConfirmMessage(sender, target, id, Database.getFlagReason(target.getUniqueId(), id));
+                            }
+                        } else {
+                            sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
                         }
-                     } else if (args.length == 3) {
-                        Utilities.sendFlagConfirmMessage(sender, target, id, Database.getFlagReason(target.getUniqueId(), id));
-                     }
-                  } else {
-                     sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
-                  }
-               } else {
-                  target = Bukkit.getServer().getOfflinePlayer(args[0]);
-                  if (Methods.getTotalActiveFlags(target) < LiteFlags.getInstance().getConfig().getInt("ActiveFlags.Limit")) {
-                     if (target != null) {
-                        if (!args[1].equals("*")) {
-                           removeTimeLetter = removeLastChar(args[1]);
-                           if (!removeTimeLetter.isEmpty()) {
-                              if (this.isInt(removeTimeLetter)) {
-                                 String getLetter = getLastChar(args[1]);
-                                 String[] validTimes = new String[]{"d", "h", "m"};
-                                 if (Arrays.asList(validTimes).contains(getLetter)) {
-                                    int number = Integer.parseInt(removeTimeLetter);
-                                    int timeInMin = this.convertTimeToMinutes(number, getLetter);
-                                    long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
-                                    int conTime = (int)currentTime + timeInMin;
+                    } else {
+                        target = Bukkit.getServer().getOfflinePlayer(args[0]);
+                        if (Methods.getTotalActiveFlags(target) < LiteFlags.getInstance().getConfig().getInt("ActiveFlags.Limit")) {
+                            if (target != null) {
+                                if (!args[1].equals("*")) {
+                                    removeTimeLetter = removeLastChar(args[1]);
+                                    if (!removeTimeLetter.isEmpty()) {
+                                        if (this.isInt(removeTimeLetter)) {
+                                            String getLetter = getLastChar(args[1]);
+                                            String[] validTimes = new String[]{"d", "h", "m"};
+                                            if (Arrays.asList(validTimes).contains(getLetter)) {
+                                                int number = Integer.parseInt(removeTimeLetter);
+                                                int timeInMin = this.convertTimeToMinutes(number, getLetter);
+                                                long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
+                                                int conTime = (int) currentTime + timeInMin;
+                                                StringBuilder reason = new StringBuilder();
+
+                                                for (int i = 2; i < args.length; ++i) {
+                                                    if (i > 2) {
+                                                        reason.append(" ");
+                                                    }
+
+                                                    reason.append(args[i]);
+                                                }
+
+                                                Database.addFlag(target.getUniqueId(), (long) ((int) TimeUnit.MINUTES.toSeconds((long) conTime)), reason.toString(), sender.getName(), Utilities.convertTime(timeInMin));
+                                                if (target.isOnline() && !MapCache.activeFlags.contains(target.getName())) {
+                                                    MapCache.activeFlags.add(target.getName());
+                                                }
+
+                                                Iterator var25 = Bukkit.getOnlinePlayers().iterator();
+
+                                                while (var25.hasNext()) {
+                                                    Player staff = (Player) var25.next();
+                                                    if (staff.hasPermission("liteflags.alertflags")) {
+                                                        staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", Utilities.convertTime(timeInMin)).replace("%reason%", reason.toString())));
+                                                    }
+                                                }
+                                            } else {
+                                                sender.sendMessage(ChatColor.RED + getLetter + " is not a valid letter. (d, h, m)");
+                                            }
+                                        } else {
+                                            sender.sendMessage(ChatColor.RED + removeTimeLetter + " is not a valid number.");
+                                        }
+                                    } else {
+                                        sender.sendMessage(ChatColor.RED + "Invalid time argument! Example: 1d");
+                                    }
+                                } else if (sender.hasPermission("liteflags.flagperm")) {
                                     StringBuilder reason = new StringBuilder();
 
-                                    for(int i = 2; i < args.length; ++i) {
-                                       if (i > 2) {
-                                          reason.append(" ");
-                                       }
+                                    for (int i = 2; i < args.length; ++i) {
+                                        if (i > 2) {
+                                            reason.append(" ");
+                                        }
 
-                                       reason.append(args[i]);
+                                        reason.append(args[i]);
                                     }
 
-                                    Database.addFlag(target.getUniqueId(), (long)((int)TimeUnit.MINUTES.toSeconds((long)conTime)), reason.toString(), sender.getName(), Utilities.convertTime(timeInMin));
-                                    if (target.isOnline() && !MapCache.activeFlags.contains(target.getName())) {
-                                       MapCache.activeFlags.add(target.getName());
+                                    Database.addFlag(target.getUniqueId(), 0L, reason.toString(), sender.getName(), "Permanent");
+                                    if (!MapCache.activeFlags.contains(target.getName())) {
+                                        MapCache.activeFlags.add(target.getName());
                                     }
 
-                                    Iterator var25 = Bukkit.getOnlinePlayers().iterator();
+                                    Iterator var21 = Bukkit.getOnlinePlayers().iterator();
 
-                                    while(var25.hasNext()) {
-                                       Player staff = (Player)var25.next();
-                                       if (staff.hasPermission("liteflags.alertflags")) {
-                                          staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", Utilities.convertTime(timeInMin)).replace("%reason%", reason.toString())));
-                                       }
+                                    while (var21.hasNext()) {
+                                        Player staff = (Player) var21.next();
+                                        if (staff.hasPermission("liteflags.alertflags")) {
+                                            staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", "Permanent").replace("%reason%", reason.toString())));
+                                        }
                                     }
-                                 } else {
-                                    sender.sendMessage(ChatColor.RED + getLetter + " is not a valid letter. (d, h, m)");
-                                 }
-                              } else {
-                                 sender.sendMessage(ChatColor.RED + removeTimeLetter + " is not a valid number.");
-                              }
-                           } else {
-                              sender.sendMessage(ChatColor.RED + "Invalid time argument! Example: 1d");
-                           }
-                        } else if (sender.hasPermission("liteflags.flagperm")) {
-                           StringBuilder reason = new StringBuilder();
-
-                           for(int i = 2; i < args.length; ++i) {
-                              if (i > 2) {
-                                 reason.append(" ");
-                              }
-
-                              reason.append(args[i]);
-                           }
-
-                           Database.addFlag(target.getUniqueId(), 0L, reason.toString(), sender.getName(), "Permanent");
-                           if (!MapCache.activeFlags.contains(target.getName())) {
-                              MapCache.activeFlags.add(target.getName());
-                           }
-
-                           Iterator var21 = Bukkit.getOnlinePlayers().iterator();
-
-                           while(var21.hasNext()) {
-                              Player staff = (Player)var21.next();
-                              if (staff.hasPermission("liteflags.alertflags")) {
-                                 staff.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.FlaggedPlayer").replace("%staff%", sender.getName()).replace("%player%", target.getName()).replace("%flaglength%", "Permanent").replace("%reason%", reason.toString())));
-                              }
-                           }
+                                } else {
+                                    sender.sendMessage(ChatColor.RED + "You do not have permission to flag permanently.");
+                                }
+                            } else {
+                                sender.sendMessage(target.getName() + " is not a valid username!");
+                            }
                         } else {
-                           sender.sendMessage(ChatColor.RED + "You do not have permission to flag permanently.");
+                            sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlagsLimit").replace("%player%", target.getName())));
                         }
-                     } else {
-                        sender.sendMessage(target.getName() + " is not a valid username!");
-                     }
-                  } else {
-                     sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlagsLimit").replace("%player%", target.getName())));
-                  }
-               }
+                    }
+                }
+            } else {
+                sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
             }
-         } else {
-            sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
-         }
-      }
+        } else if (cmd.getName().equalsIgnoreCase("flaglist")) {
+            if (sender.hasPermission("liteflags.staff")) {
+                if (args.length == 0) {
+                    if (MapCache.activeFlags.size() > 0) {
+                        Iterator var17 = MapCache.activeFlags.iterator();
 
-      if (cmd.getName().equalsIgnoreCase("flaglist")) {
-         if (sender.hasPermission("liteflags.staff")) {
-            if (args.length == 0) {
-               if (MapCache.activeFlags.size() > 0) {
-                  Iterator var17 = MapCache.activeFlags.iterator();
+                        while (var17.hasNext()) {
+                            removeTimeLetter = (String) var17.next();
+                            OfflinePlayer afPlayer = Bukkit.getServer().getOfflinePlayer(removeTimeLetter);
+                            int totalFlags = Methods.getTotalActiveFlags(afPlayer);
+                            Utilities.sendStaffHoverMessage(afPlayer, (Player) sender, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", afPlayer.getName()).replace("%totalactflags%", "" + totalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
+                        }
+                    } else {
+                        sender.sendMessage(ChatColor.GRAY + "No players have active flags.");
+                    }
+                }
 
-                  while(var17.hasNext()) {
-                     removeTimeLetter = (String)var17.next();
-                     OfflinePlayer afPlayer = Bukkit.getServer().getOfflinePlayer(removeTimeLetter);
-                     int totalFlags = Methods.getTotalActiveFlags(afPlayer);
-                     Utilities.sendStaffHoverMessage(afPlayer, (Player)sender, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", afPlayer.getName()).replace("%totalactflags%", "" + totalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
-                  }
-               } else {
-                  sender.sendMessage(ChatColor.GRAY + "No players have active flags.");
-               }
+                if (args.length >= 1) {
+                    target = Bukkit.getServer().getOfflinePlayer(args[0]);
+                    this.sendFlagMessage(sender, target);
+                }
+            } else {
+                sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
             }
+        }
 
-            if (args.length >= 1) {
-               target = Bukkit.getServer().getOfflinePlayer(args[0]);
-               this.sendFlagMessage(sender, target);
+        return false;
+    }
+
+    private static String getLastChar(String str) {
+        return str.substring(str.length() - 1);
+    }
+
+    private static String removeLastChar(String str) {
+        return str.substring(0, str.length() - 1);
+    }
+
+    public int convertTimeToMinutes(int number, String dhm) {
+        if (dhm.equalsIgnoreCase("d")) {
+            return 1440 * number;
+        } else {
+            return dhm.equalsIgnoreCase("h") ? 60 * number : number;
+        }
+    }
+
+    public boolean isInt(String s) {
+        try {
+            Integer.parseInt(s);
+            return true;
+        } catch (NumberFormatException var3) {
+            return false;
+        }
+    }
+
+    public void sendFlagMessage(CommandSender sender, OfflinePlayer targetPlayer) {
+        List<String> body = LiteFlags.getInstance().getConfig().getStringList("Messages.PlayerFlagsBody");
+        int i = 0;
+        //int id = false;
+        boolean headerMessage = false;
+        if (Database.hasFlags(targetPlayer.getUniqueId())) {
+            try {
+                ResultSet flag = Database.getPlayerFlags(targetPlayer.getUniqueId());
+
+                label52:
+                while (flag.next()) {
+                    long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
+                    long timeFlagged = TimeUnit.SECONDS.toMinutes((long) flag.getInt("time_flagged"));
+                    long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                    int convertedExpireTime = (int) expireTime - (int) currentTime;
+                    int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
+                    String flaggedBy = flag.getString("flagged_by");
+                    String flagLength = flag.getString("flag_length");
+                    String reason = flag.getString("reason");
+                    int id = flag.getInt("id");
+                    TextComponent mainComponent = null;
+                    Iterator var20 = body.iterator();
+
+                    while (true) {
+                        while (true) {
+                            if (!var20.hasNext()) {
+                                continue label52;
+                            }
+
+                            String s = (String) var20.next();
+                            s = s.replaceFirst("%player%", targetPlayer.getName());
+                            s = s.replaceFirst("%staff%", flaggedBy);
+                            s = s.replaceFirst("%flaglength%", flagLength);
+                            s = s.replaceFirst("%reason%", reason);
+                            s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
+                            if (expireTime != 0L) {
+                                s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime));
+                            }
+
+                            s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
+                            s = s.replaceFirst("%nl%", " ");
+                            if (convertedExpireTime < 0 && expireTime != 0L) {
+                                s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
+                                mainComponent = new TextComponent(Utilities.format(s));
+                            } else {
+                                s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
+                                mainComponent = new TextComponent(Utilities.format(s));
+                            }
+
+                            if (!headerMessage) {
+                                headerMessage = true;
+                                sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()))));
+                            }
+
+                            if (!s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags")) && !s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"))) {
+                                sender.sendMessage(Utilities.format(s));
+                            } else {
+                                mainComponent.setColor(net.md_5.bungee.api.ChatColor.GOLD);
+                                TextComponent removeButton = new TextComponent("[✖]");
+                                removeButton.setColor(net.md_5.bungee.api.ChatColor.GRAY);
+                                removeButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(net.md_5.bungee.api.ChatColor.GRAY + "Click to remove this flag")).create()));
+                                removeButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName()));
+                                mainComponent.addExtra(removeButton);
+                                sender.spigot().sendMessage(mainComponent);
+                            }
+                        }
+                    }
+                }
+            } catch (SQLException var23) {
+                var23.printStackTrace();
             }
-         } else {
-            sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.NoPermission")));
-         }
-      }
+        } else {
+            sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + i)));
+        }
 
-      return false;
-   }
-
-   private static String getLastChar(String str) {
-      return str.substring(str.length() - 1);
-   }
-
-   private static String removeLastChar(String str) {
-      return str.substring(0, str.length() - 1);
-   }
-
-   public int convertTimeToMinutes(int number, String dhm) {
-      if (dhm.equalsIgnoreCase("d")) {
-         return 1440 * number;
-      } else {
-         return dhm.equalsIgnoreCase("h") ? 60 * number : number;
-      }
-   }
-
-   public boolean isInt(String s) {
-      try {
-         Integer.parseInt(s);
-         return true;
-      } catch (NumberFormatException var3) {
-         return false;
-      }
-   }
-
-   public void sendFlagMessage(CommandSender sender, OfflinePlayer targetPlayer) {
-      List<String> body = LiteFlags.getInstance().getConfig().getStringList("Messages.PlayerFlagsBody");
-      int i = 0;
-      //int id = false;
-      boolean headerMessage = false;
-      if (Database.hasFlags(targetPlayer.getUniqueId())) {
-         try {
-            ResultSet flag = Database.getPlayerFlags(targetPlayer.getUniqueId());
-
-            label52:
-            while(flag.next()) {
-               long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
-               long timeFlagged = TimeUnit.SECONDS.toMinutes((long)flag.getInt("time_flagged"));
-               long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
-               int convertedExpireTime = (int)expireTime - (int)currentTime;
-               int convertedFlaggedTime = (int)currentTime - (int)timeFlagged;
-               String flaggedBy = flag.getString("flagged_by");
-               String flagLength = flag.getString("flag_length");
-               String reason = flag.getString("reason");
-               int id = flag.getInt("id");
-               TextComponent mainComponent = null;
-               Iterator var20 = body.iterator();
-
-               while(true) {
-                  while(true) {
-                     if (!var20.hasNext()) {
-                        continue label52;
-                     }
-
-                     String s = (String)var20.next();
-                     s = s.replaceFirst("%player%", targetPlayer.getName());
-                     s = s.replaceFirst("%staff%", flaggedBy);
-                     s = s.replaceFirst("%flaglength%", flagLength);
-                     s = s.replaceFirst("%reason%", reason);
-                     s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
-                     if (expireTime != 0L) {
-                        s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime));
-                     }
-
-                     s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
-                     s = s.replaceFirst("%nl%", " ");
-                     if (convertedExpireTime < 0 && expireTime != 0L) {
-                        s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
-                        mainComponent = new TextComponent(Utilities.format(s));
-                     } else {
-                        s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
-                        mainComponent = new TextComponent(Utilities.format(s));
-                     }
-
-                     if (!headerMessage) {
-                        headerMessage = true;
-                        sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()))));
-                     }
-
-                     if (!s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags")) && !s.contains(LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"))) {
-                        sender.sendMessage(Utilities.format(s));
-                     } else {
-                        mainComponent.setColor(net.md_5.bungee.api.ChatColor.GOLD);
-                        TextComponent removeButton = new TextComponent("[✖]");
-                        removeButton.setColor(net.md_5.bungee.api.ChatColor.GRAY);
-                        removeButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(net.md_5.bungee.api.ChatColor.GRAY + "Click to remove this flag")).create()));
-                        removeButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName()));
-                        mainComponent.addExtra(removeButton);
-                        sender.spigot().sendMessage(mainComponent);
-                     }
-                  }
-               }
-            }
-         } catch (SQLException var23) {
-            var23.printStackTrace();
-         }
-      } else {
-         sender.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", "" + i)));
-      }
-
-   }
+    }
 }
diff --git a/src/main/java/com/liteflags/data/Data.java b/src/main/java/com/liteflags/data/Data.java
deleted file mode 100644
index 6dcc192..0000000
--- a/src/main/java/com/liteflags/data/Data.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.liteflags.data;
-
-public class Data {
-}
diff --git a/src/main/java/com/liteflags/data/database/Database.java b/src/main/java/com/liteflags/data/database/Database.java
index caa2cb7..46dd139 100644
--- a/src/main/java/com/liteflags/data/database/Database.java
+++ b/src/main/java/com/liteflags/data/database/Database.java
@@ -1,6 +1,7 @@
 package com.liteflags.data.database;
 
 import com.liteflags.LiteFlags;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -8,226 +9,226 @@ import java.sql.Statement;
 import java.util.UUID;
 
 public class Database {
-   public static void createTables() {
-      String player_flags = "CREATE TABLE IF NOT EXISTS player_flags (\n id INTEGER NOT NULL AUTO_INCREMENT,\n uuid VARCHAR(36) NOT NULL,\n  expire_time INTEGER(12),\n reason VARCHAR(256) NOT NULL,\n flagged_by VARCHAR(16) NOT NULL,\n time_flagged INTEGER(16) NOT NULL,\n flag_length VARCHAR(36) NOT NULL,\n PRIMARY KEY(ID)\n);";
-      String player_cache = "CREATE TABLE IF NOT EXISTS player_cache (\n uuid VARCHAR(36) NOT NULL,\n player_name VARCHAR(16),\n PRIMARY KEY(uuid)\n);";
+    public static void createTables() {
+        String player_flags = "CREATE TABLE IF NOT EXISTS player_flags (\n id INTEGER NOT NULL AUTO_INCREMENT,\n uuid VARCHAR(36) NOT NULL,\n  expire_time INTEGER(12),\n reason VARCHAR(256) NOT NULL,\n flagged_by VARCHAR(16) NOT NULL,\n time_flagged INTEGER(16) NOT NULL,\n flag_length VARCHAR(36) NOT NULL,\n PRIMARY KEY(ID)\n);";
+        String player_cache = "CREATE TABLE IF NOT EXISTS player_cache (\n uuid VARCHAR(36) NOT NULL,\n player_name VARCHAR(16),\n PRIMARY KEY(uuid)\n);";
 
-      try {
-         Statement statement = DatabaseConnection.getConnection().createStatement();
-         statement.execute(player_flags);
-         statement.execute(player_cache);
-      } catch (SQLException var3) {
-         var3.printStackTrace();
-      }
+        try {
+            Statement statement = DatabaseConnection.getConnection().createStatement();
+            statement.execute(player_flags);
+            statement.execute(player_cache);
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
 
-   }
+    }
 
-   public static void addFlag(UUID uuid, long expireTime, String reason, String flaggedBy, String flagLength) {
-      int timeFlagged = (int)(System.currentTimeMillis() / 1000L);
-      String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)";
+    public static void addFlag(UUID uuid, long expireTime, String reason, String flaggedBy, String flagLength) {
+        int timeFlagged = (int) (System.currentTimeMillis() / 1000L);
+        String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)";
 
-      try {
-         PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
-         Throwable var9 = null;
+        try {
+            PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
+            Throwable var9 = null;
+
+            try {
+                statement.setString(1, uuid.toString());
+                statement.setLong(2, expireTime);
+                statement.setString(3, reason);
+                statement.setString(4, flaggedBy);
+                statement.setInt(5, timeFlagged);
+                statement.setString(6, flagLength);
+                statement.execute();
+            } catch (Throwable var19) {
+                var9 = var19;
+                throw var19;
+            } finally {
+                if (statement != null) {
+                    if (var9 != null) {
+                        try {
+                            statement.close();
+                        } catch (Throwable var18) {
+                            var9.addSuppressed(var18);
+                        }
+                    } else {
+                        statement.close();
+                    }
+                }
 
-         try {
-            statement.setString(1, uuid.toString());
-            statement.setLong(2, expireTime);
-            statement.setString(3, reason);
-            statement.setString(4, flaggedBy);
-            statement.setInt(5, timeFlagged);
-            statement.setString(6, flagLength);
-            statement.execute();
-         } catch (Throwable var19) {
-            var9 = var19;
-            throw var19;
-         } finally {
-            if (statement != null) {
-               if (var9 != null) {
-                  try {
-                     statement.close();
-                  } catch (Throwable var18) {
-                     var9.addSuppressed(var18);
-                  }
-               } else {
-                  statement.close();
-               }
             }
+        } catch (SQLException var21) {
+            var21.printStackTrace();
+        }
 
-         }
-      } catch (SQLException var21) {
-         var21.printStackTrace();
-      }
+    }
 
-   }
+    public static void removeFlag(UUID uuid, int id) {
+        String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?";
 
-   public static void removeFlag(UUID uuid, int id) {
-      String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?";
+        try {
+            PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
+            Throwable var4 = null;
 
-      try {
-         PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
-         Throwable var4 = null;
+            try {
+                statement.setString(1, uuid.toString());
+                statement.setInt(2, id);
+                statement.executeUpdate();
+            } catch (Throwable var14) {
+                var4 = var14;
+                throw var14;
+            } finally {
+                if (statement != null) {
+                    if (var4 != null) {
+                        try {
+                            statement.close();
+                        } catch (Throwable var13) {
+                            var4.addSuppressed(var13);
+                        }
+                    } else {
+                        statement.close();
+                    }
+                }
 
-         try {
-            statement.setString(1, uuid.toString());
-            statement.setInt(2, id);
-            statement.executeUpdate();
-         } catch (Throwable var14) {
-            var4 = var14;
-            throw var14;
-         } finally {
-            if (statement != null) {
-               if (var4 != null) {
-                  try {
-                     statement.close();
-                  } catch (Throwable var13) {
-                     var4.addSuppressed(var13);
-                  }
-               } else {
-                  statement.close();
-               }
             }
+        } catch (SQLException var16) {
+            var16.printStackTrace();
+        }
 
-         }
-      } catch (SQLException var16) {
-         var16.printStackTrace();
-      }
+    }
 
-   }
+    public static Integer countFlags(UUID uuid) {
+        int i = 0;
 
-   public static Integer countFlags(UUID uuid) {
-      int i = 0;
-
-      try {
-         for(ResultSet resultSet = getPlayerFlags(uuid); resultSet.next(); ++i) {
-         }
-      } catch (SQLException var3) {
-         var3.printStackTrace();
-      }
-
-      return i;
-   }
-
-   public static void removePlayerCache(UUID uuid) {
-      String sql = "DELETE FROM player_cache WHERE uuid = ?";
-
-      try {
-         PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
-         Throwable var3 = null;
-
-         try {
-            statement.setString(1, uuid.toString());
-            statement.executeUpdate();
-         } catch (Throwable var13) {
-            var3 = var13;
-            throw var13;
-         } finally {
-            if (statement != null) {
-               if (var3 != null) {
-                  try {
-                     statement.close();
-                  } catch (Throwable var12) {
-                     var3.addSuppressed(var12);
-                  }
-               } else {
-                  statement.close();
-               }
+        try {
+            for (ResultSet resultSet = getPlayerFlags(uuid); resultSet.next(); ++i) {
             }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
 
-         }
-      } catch (SQLException var15) {
-         var15.printStackTrace();
-      }
+        return i;
+    }
 
-   }
+    public static void removePlayerCache(UUID uuid) {
+        String sql = "DELETE FROM player_cache WHERE uuid = ?";
 
-   public static boolean hasFlags(UUID u) {
-      try {
-         if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", u.toString()).next()) {
-            return true;
-         }
-      } catch (SQLException var2) {
-         var2.printStackTrace();
-      }
+        try {
+            PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
+            Throwable var3 = null;
 
-      return false;
-   }
+            try {
+                statement.setString(1, uuid.toString());
+                statement.executeUpdate();
+            } catch (Throwable var13) {
+                var3 = var13;
+                throw var13;
+            } finally {
+                if (statement != null) {
+                    if (var3 != null) {
+                        try {
+                            statement.close();
+                        } catch (Throwable var12) {
+                            var3.addSuppressed(var12);
+                        }
+                    } else {
+                        statement.close();
+                    }
+                }
 
-   public static void addPlayerCache(UUID uuid, String playerName) {
-      String sql = "INSERT INTO player_cache (uuid, player_name) VALUES (?, ?) ON DUPLICATE KEY UPDATE player_name = ?";
-
-      try {
-         PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
-         Throwable var4 = null;
-
-         try {
-            statement.setString(1, uuid.toString());
-            statement.setString(2, playerName);
-            statement.setString(3, playerName);
-            statement.execute();
-         } catch (Throwable var14) {
-            var4 = var14;
-            throw var14;
-         } finally {
-            if (statement != null) {
-               if (var4 != null) {
-                  try {
-                     statement.close();
-                  } catch (Throwable var13) {
-                     var4.addSuppressed(var13);
-                  }
-               } else {
-                  statement.close();
-               }
             }
+        } catch (SQLException var15) {
+            var15.printStackTrace();
+        }
 
-         }
-      } catch (SQLException var16) {
-         var16.printStackTrace();
-      }
+    }
 
-   }
+    public static boolean hasFlags(UUID u) {
+        try {
+            if (getStringResult("SELECT * FROM player_flags WHERE uuid = ?", u.toString()).next()) {
+                return true;
+            }
+        } catch (SQLException var2) {
+            var2.printStackTrace();
+        }
 
-   public static boolean inPlayerCache(UUID uuid) {
-      try {
-         if (getStringResult("SELECT * FROM player_cache WHERE uuid = ?", uuid.toString()).next()) {
-            return true;
-         }
-      } catch (SQLException var2) {
-         var2.printStackTrace();
-      }
+        return false;
+    }
 
-      return false;
-   }
+    public static void addPlayerCache(UUID uuid, String playerName) {
+        String sql = "INSERT INTO player_cache (uuid, player_name) VALUES (?, ?) ON DUPLICATE KEY UPDATE player_name = ?";
 
-   public static String getFlagReason(UUID uuid, int id) {
-      try {
-         ResultSet resultSet = getStringResult("SELECT reason FROM player_flags WHERE uuid = ? AND id = " + id, uuid.toString());
-         if (resultSet.next()) {
-            return resultSet.getString("reason");
-         }
-      } catch (SQLException var3) {
-         var3.printStackTrace();
-      }
+        try {
+            PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
+            Throwable var4 = null;
 
-      return null;
-   }
+            try {
+                statement.setString(1, uuid.toString());
+                statement.setString(2, playerName);
+                statement.setString(3, playerName);
+                statement.execute();
+            } catch (Throwable var14) {
+                var4 = var14;
+                throw var14;
+            } finally {
+                if (statement != null) {
+                    if (var4 != null) {
+                        try {
+                            statement.close();
+                        } catch (Throwable var13) {
+                            var4.addSuppressed(var13);
+                        }
+                    } else {
+                        statement.close();
+                    }
+                }
 
-   public static ResultSet getPlayerFlags(UUID uuid) throws SQLException {
-      return getStringResult("SELECT * FROM player_flags WHERE uuid = ? ORDER BY id DESC LIMIT " + LiteFlags.getInstance().getConfig().getInt("FlagsHistory.ListLimit"), uuid.toString());
-   }
+            }
+        } catch (SQLException var16) {
+            var16.printStackTrace();
+        }
 
-   public static ResultSet getActiveTime(UUID uuid) throws SQLException {
-      return getStringResult("SELECT expire_time, flagged_by FROM player_flags WHERE uuid = ?", uuid.toString());
-   }
+    }
 
-   private static ResultSet getStringResult(String query, String... parameters) throws SQLException {
-      PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(query);
+    public static boolean inPlayerCache(UUID uuid) {
+        try {
+            if (getStringResult("SELECT * FROM player_cache WHERE uuid = ?", uuid.toString()).next()) {
+                return true;
+            }
+        } catch (SQLException var2) {
+            var2.printStackTrace();
+        }
 
-      for(int i = 1; i < parameters.length + 1; ++i) {
-         statement.setString(i, parameters[i - 1]);
-      }
+        return false;
+    }
 
-      return statement.executeQuery();
-   }
+    public static String getFlagReason(UUID uuid, int id) {
+        try {
+            ResultSet resultSet = getStringResult("SELECT reason FROM player_flags WHERE uuid = ? AND id = " + id, uuid.toString());
+            if (resultSet.next()) {
+                return resultSet.getString("reason");
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static ResultSet getPlayerFlags(UUID uuid) throws SQLException {
+        return getStringResult("SELECT * FROM player_flags WHERE uuid = ? ORDER BY id DESC LIMIT " + LiteFlags.getInstance().getConfig().getInt("FlagsHistory.ListLimit"), uuid.toString());
+    }
+
+    public static ResultSet getActiveTime(UUID uuid) throws SQLException {
+        return getStringResult("SELECT expire_time, flagged_by FROM player_flags WHERE uuid = ?", uuid.toString());
+    }
+
+    private static ResultSet getStringResult(String query, String... parameters) throws SQLException {
+        PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(query);
+
+        for (int i = 1; i < parameters.length + 1; ++i) {
+            statement.setString(i, parameters[i - 1]);
+        }
+
+        return statement.executeQuery();
+    }
 }
diff --git a/src/main/java/com/liteflags/data/database/DatabaseConnection.java b/src/main/java/com/liteflags/data/database/DatabaseConnection.java
index c6e5c36..b77f6da 100644
--- a/src/main/java/com/liteflags/data/database/DatabaseConnection.java
+++ b/src/main/java/com/liteflags/data/database/DatabaseConnection.java
@@ -1,47 +1,48 @@
 package com.liteflags.data.database;
 
 import com.liteflags.LiteFlags;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
 public class DatabaseConnection {
-   public static DatabaseConnection instance;
-   public Connection connection;
-   public String drivers = LiteFlags.getInstance().getConfig().getString("Database.Drivers");
-   public String ip = LiteFlags.getInstance().getConfig().getString("Database.IP");
-   public String port = LiteFlags.getInstance().getConfig().getString("Database.Port");
-   public String database = LiteFlags.getInstance().getConfig().getString("Database.Database");
-   public String username = LiteFlags.getInstance().getConfig().getString("Database.Username");
-   public String password = LiteFlags.getInstance().getConfig().getString("Database.Password");
+    public static DatabaseConnection instance;
+    public Connection connection;
+    public String drivers = LiteFlags.getInstance().getConfig().getString("Database.Drivers");
+    public String ip = LiteFlags.getInstance().getConfig().getString("Database.IP");
+    public String port = LiteFlags.getInstance().getConfig().getString("Database.Port");
+    public String database = LiteFlags.getInstance().getConfig().getString("Database.Database");
+    public String username = LiteFlags.getInstance().getConfig().getString("Database.Username");
+    public String password = LiteFlags.getInstance().getConfig().getString("Database.Password");
 
-   public DatabaseConnection() throws SQLException {
-      instance = this;
-      instance.openConnection();
-      Database.createTables();
-   }
+    public DatabaseConnection() throws SQLException {
+        instance = this;
+        instance.openConnection();
+        Database.createTables();
+    }
 
-   public void openConnection() throws SQLException {
-      if (this.connection == null || this.connection.isClosed()) {
-         synchronized(this) {
-            if (this.connection == null || this.connection.isClosed()) {
-               this.connection = DriverManager.getConnection("jdbc:" + this.drivers + "://" + this.ip + ":" + this.port + "/" + this.database, this.username, this.password);
+    public void openConnection() throws SQLException {
+        if (this.connection == null || this.connection.isClosed()) {
+            synchronized (this) {
+                if (this.connection == null || this.connection.isClosed()) {
+                    this.connection = DriverManager.getConnection("jdbc:" + this.drivers + "://" + this.ip + ":" + this.port + "/" + this.database, this.username, this.password);
+                }
             }
-         }
-      }
-   }
+        }
+    }
 
-   public static Connection getConnection() {
-      try {
-         instance.openConnection();
-      } catch (SQLException var1) {
-         var1.printStackTrace();
-      }
+    public static Connection getConnection() {
+        try {
+            instance.openConnection();
+        } catch (SQLException var1) {
+            var1.printStackTrace();
+        }
 
-      return instance.connection;
-   }
+        return instance.connection;
+    }
 
-   public static void initialize() throws SQLException {
-      instance = new DatabaseConnection();
-   }
+    public static void initialize() throws SQLException {
+        instance = new DatabaseConnection();
+    }
 }
diff --git a/src/main/java/com/liteflags/data/database/Methods.java b/src/main/java/com/liteflags/data/database/Methods.java
index 3ea6734..86fa3fa 100644
--- a/src/main/java/com/liteflags/data/database/Methods.java
+++ b/src/main/java/com/liteflags/data/database/Methods.java
@@ -2,111 +2,100 @@ package com.liteflags.data.database;
 
 import com.liteflags.LiteFlags;
 import com.liteflags.util.Utilities;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.TimeUnit;
+
 import org.bukkit.OfflinePlayer;
 
 public class Methods {
-   public static int consoleFlags;
-   public static int staffFlags;
-   public static String flagListLimit = LiteFlags.getInstance().getConfig().getString("ActiveFlags.Limit");
-   public static String playerFlagsHeader;
+    public static int consoleFlags;
+    public static int staffFlags;
+    public static String flagListLimit = LiteFlags.getInstance().getConfig().getString("ActiveFlags.Limit");
+    public static String playerFlagsHeader;
 
-   public static boolean hasActiveFlags(OfflinePlayer player) {
-      try {
-         ResultSet flag = Database.getActiveTime(player.getUniqueId());
+    public static boolean hasActiveFlags(OfflinePlayer player) {
+        try {
+            ResultSet flag = Database.getActiveTime(player.getUniqueId());
 
-         while(flag.next()) {
-            long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
-            long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
-            int convertedExpireTime = (int)expireTime - (int)currentTime;
-            if (convertedExpireTime >= 0) {
-               return true;
+            while (flag.next()) {
+                long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
+                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                int convertedExpireTime = (int) expireTime - (int) currentTime;
+
+                if (convertedExpireTime >= 0 || expireTime == 0L) {
+                    return true;
+                }
             }
+        } catch (SQLException var7) {
+            var7.printStackTrace();
+        }
 
-            if (expireTime == 0L) {
-               return true;
+        return false;
+    }
+
+    public static int getTotalActiveFlags(OfflinePlayer player) {
+        consoleFlags = 0;
+        staffFlags = 0;
+        int i = 0;
+
+        try {
+            ResultSet flag = Database.getActiveTime(player.getUniqueId());
+
+            while (flag.next()) {
+                long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
+                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                int convertedExpireTime = (int) expireTime - (int) currentTime;
+
+                if (convertedExpireTime >= 0 || expireTime == 0L) {
+                    ++i;
+                    if (flag.getString("flagged_by").equalsIgnoreCase("console")) {
+                        ++consoleFlags;
+                    } else {
+                        ++staffFlags;
+                    }
+                }
             }
-         }
-      } catch (SQLException var7) {
-         var7.printStackTrace();
-      }
+        } catch (SQLException var9) {
+            var9.printStackTrace();
+        }
 
-      return false;
-   }
+        return i;
+    }
 
-   public static int getTotalActiveFlags(OfflinePlayer player) {
-      consoleFlags = 0;
-      staffFlags = 0;
-      int i = 0;
+    public static int getActiveConsoleFlags(OfflinePlayer player) {
+        int i = 0;
 
-      try {
-         ResultSet flag = Database.getActiveTime(player.getUniqueId());
+        try {
+            ResultSet flag = Database.getActiveTime(player.getUniqueId());
 
-         while(flag.next()) {
-            long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
-            long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
-            int convertedExpireTime = (int)expireTime - (int)currentTime;
-            String s;
-            if (convertedExpireTime >= 0) {
-               ++i;
-               s = flag.getString("flagged_by");
-               if (s.equalsIgnoreCase("console")) {
-                  ++consoleFlags;
-               } else {
-                  ++staffFlags;
-               }
-            } else if (expireTime == 0L) {
-               ++i;
-               s = flag.getString("flagged_by");
-               if (s.equalsIgnoreCase("console")) {
-                  ++consoleFlags;
-               } else {
-                  ++staffFlags;
-               }
+            while (flag.next()) {
+                long expireTime = TimeUnit.SECONDS.toMinutes((long) flag.getInt("expire_time"));
+                long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
+                int convertedExpireTime = (int) expireTime - (int) currentTime;
+
+                if (convertedExpireTime >= 0) {
+                    String s = flag.getString("flagged_by");
+                    if (s.equalsIgnoreCase("console")) {
+                        ++i;
+                    }
+                }
             }
-         }
-      } catch (SQLException var9) {
-         var9.printStackTrace();
-      }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
 
-      return i;
-   }
+        return i;
+    }
 
-   public static int getActiveConsoleFlags(OfflinePlayer player) {
-      int i = 0;
+    public static int getRandomIntegerBetweenRange(int min, int max) {
+        int x = (int) (Math.random() * (double) (max - min + 1)) + min;
+        return x;
+    }
 
-      try {
-         ResultSet flag = Database.getActiveTime(player.getUniqueId());
-
-         while(flag.next()) {
-            long expireTime = TimeUnit.SECONDS.toMinutes((long)flag.getInt("expire_time"));
-            long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
-            int convertedExpireTime = (int)expireTime - (int)currentTime;
-            if (convertedExpireTime >= 0) {
-               String s = flag.getString("flagged_by");
-               if (s.equalsIgnoreCase("console")) {
-                  ++i;
-               }
-            }
-         }
-      } catch (SQLException var9) {
-         var9.printStackTrace();
-      }
-
-      return i;
-   }
-
-   public static void getPlayerFlags(OfflinePlayer targetPlayer) {
-   }
-
-   public static int getRandomIntegerBetweenRange(int min, int max) {
-      int x = (int)(Math.random() * (double)(max - min + 1)) + min;
-      return x;
-   }
-
-   static {
-      playerFlagsHeader = Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader").replace("%limit%", flagListLimit));
-   }
+    static {
+        playerFlagsHeader = Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.PlayerFlagsHeader")
+                .replace("%limit%", flagListLimit));
+    }
 }
diff --git a/src/main/java/com/liteflags/data/maps/MapCache.java b/src/main/java/com/liteflags/data/maps/MapCache.java
index 38209ee..6dd928a 100644
--- a/src/main/java/com/liteflags/data/maps/MapCache.java
+++ b/src/main/java/com/liteflags/data/maps/MapCache.java
@@ -6,6 +6,6 @@ import java.util.List;
 import java.util.Map;
 
 public class MapCache {
-   public static Map<String, String> reauthedPlayers = new HashMap();
-   public static List<String> activeFlags = new ArrayList();
+    public static Map<String, String> reauthedPlayers = new HashMap();
+    public static List<String> activeFlags = new ArrayList();
 }
diff --git a/src/main/java/com/liteflags/events/ChatEvent.java b/src/main/java/com/liteflags/events/ChatEvent.java
index b7bd053..93cc31c 100644
--- a/src/main/java/com/liteflags/events/ChatEvent.java
+++ b/src/main/java/com/liteflags/events/ChatEvent.java
@@ -5,8 +5,10 @@ import com.liteflags.data.database.Database;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
+
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,44 +17,54 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class ChatEvent implements Listener {
-   private LiteFlags flags;
 
-   public ChatEvent(LiteFlags flags) {
-      this.flags = flags;
-   }
+    @EventHandler
+    public void onPlayerChat(AsyncPlayerChatEvent e) {
+        final Player player = e.getPlayer();
 
-   @EventHandler
-   public void onPlayerChat(AsyncPlayerChatEvent e) {
-      final Player player = e.getPlayer();
-      if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
-         String value = MapCache.reauthedPlayers.get(player.getUniqueId().toString());
-         if (e.getMessage().equals(value)) {
+        if (!MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
+            return;
+        }
+
+        String value = MapCache.reauthedPlayers.get(player.getUniqueId().toString());
+
+        if (e.getMessage().equals(value)) {
             e.setCancelled(true);
+
             player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Success")));
-            long time = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L) + 5L;
+
             final int min = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MinNumber");
             final int max = LiteFlags.getInstance().getConfig().getInt("RandomReauth.MaxNumber");
-            new Random();
-            final String timeAmount = LiteFlags.getInstance().getConfig().getString("RandomReauth.TimeFormat");
-            (new BukkitRunnable() {
-               public void run() {
-                  Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), LiteFlags.getInstance().getConfig().getString("Commands.TempAuthSuccess").replace("%player%", player.getName()).replace("%permission%", "liteflags.authentication.success").replace("%expiretime%", Methods.getRandomIntegerBetweenRange(min, max) + timeAmount.substring(0, 1).toLowerCase()));
-               }
-            }).runTask(LiteFlags.getInstance());
-            MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
-            if (Database.inPlayerCache(player.getUniqueId())) {
-               long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
-               int expireTime = 10080;
-               int conTime = (int)currentTime + expireTime;
-               Database.addFlag(player.getUniqueId(), (long)((int)TimeUnit.MINUTES.toSeconds((long)conTime)), "Possible Hacked Client - Logged out before authenticating.", "Console", "7 Days");
-               Database.removePlayerCache(player.getUniqueId());
-            }
-         } else {
-            e.setCancelled(true);
-            player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Failed").replace("%code%", (CharSequence)MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
-            LiteFlags.getInstance().getLogger().info(player.getName() + " tried talking while authenticating: " + e.getMessage());
-         }
-      }
 
-   }
+            final String timeAmount = LiteFlags.getInstance().getConfig().getString("RandomReauth.TimeFormat");
+
+            new BukkitRunnable() {
+                public void run() {
+                    Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
+                            LiteFlags.getInstance().getConfig().getString("Commands.TempAuthSuccess")
+                                    .replace("%player%", player.getName())
+                                    .replace("%permission%", "liteflags.authentication.success")
+                                    .replace("%expiretime%",
+                                            Methods.getRandomIntegerBetweenRange(min, max)
+                                                    + timeAmount.substring(0, 1).toLowerCase()));
+                }
+            }.runTask(LiteFlags.getInstance());
+
+            MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
+
+            if (Database.inPlayerCache(player.getUniqueId())) {
+                long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
+                int expireTime = 10080;
+                int conTime = (int) currentTime + expireTime;
+
+                Database.addFlag(player.getUniqueId(), (long) ((int) TimeUnit.MINUTES.toSeconds((long) conTime)), "Possible Hacked Client - Logged out before authenticating.", "Console", "7 Days");
+                Database.removePlayerCache(player.getUniqueId());
+            }
+
+        } else {
+            e.setCancelled(true);
+            player.sendMessage(Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.Authenticate_Failed").replace("%code%", (CharSequence) MapCache.reauthedPlayers.get(player.getUniqueId().toString()))));
+            LiteFlags.getInstance().getLogger().info(player.getName() + " tried talking while authenticating: " + e.getMessage());
+        }
+    }
 }
diff --git a/src/main/java/com/liteflags/events/LoginEvent.java b/src/main/java/com/liteflags/events/LoginEvent.java
index 3193b46..5f1b707 100644
--- a/src/main/java/com/liteflags/events/LoginEvent.java
+++ b/src/main/java/com/liteflags/events/LoginEvent.java
@@ -5,7 +5,7 @@ import com.liteflags.auth.Authentication;
 import com.liteflags.data.database.Methods;
 import com.liteflags.data.maps.MapCache;
 import com.liteflags.util.Utilities;
-import java.util.Iterator;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -13,31 +13,25 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
 public class LoginEvent implements Listener {
-   private LiteFlags flags;
 
-   public LoginEvent(LiteFlags flags) {
-      this.flags = flags;
-   }
+    @EventHandler
+    public void onPlayerLogin(PlayerJoinEvent e) {
+        Player player = e.getPlayer();
+        if (!player.hasPermission("liteflags.authentication.bypass")) {
+            Authentication.checkAuthStatus(player.getUniqueId());
+        }
 
-   @EventHandler
-   public void onPlayerLogin(PlayerJoinEvent e) {
-      Player player = e.getPlayer();
-      if (!player.hasPermission("liteflags.authentication.bypass")) {
-         Authentication.checkAuthStatus(player.getUniqueId());
-      }
+        if (!Methods.hasActiveFlags(player)) {
+            return;
+        }
 
-      if (Methods.hasActiveFlags(player)) {
-         MapCache.activeFlags.add(player.getName());
-         Iterator var3 = Bukkit.getOnlinePlayers().iterator();
+        MapCache.activeFlags.add(player.getName());
 
-         while(var3.hasNext()) {
-            Player staff = (Player)var3.next();
-            if (staff.hasPermission("liteflags.alertflags") && !LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").equalsIgnoreCase("disablethis")) {
-               int activeTotalFlags = Methods.getTotalActiveFlags(player);
-               Utilities.sendStaffHoverMessage(player, staff, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", player.getName()).replace("%totalactflags%", "" + activeTotalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
+            if (onlinePlayer.hasPermission("liteflags.alertflags") && !LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").equalsIgnoreCase("disablethis")) {
+                int activeTotalFlags = Methods.getTotalActiveFlags(player);
+                Utilities.sendStaffHoverMessage(player, onlinePlayer, Utilities.format(LiteFlags.getInstance().getConfig().getString("Messages.AlertActiveFlags").replace("%player%", player.getName()).replace("%totalactflags%", "" + activeTotalFlags).replace("%consoleFlags%", "" + Methods.consoleFlags).replace("%staffFlags%", "" + Methods.staffFlags)));
             }
-         }
-      }
-
-   }
+        }
+    }
 }
diff --git a/src/main/java/com/liteflags/events/LogoutEvent.java b/src/main/java/com/liteflags/events/LogoutEvent.java
index 176d51d..6ab6a65 100644
--- a/src/main/java/com/liteflags/events/LogoutEvent.java
+++ b/src/main/java/com/liteflags/events/LogoutEvent.java
@@ -10,27 +10,26 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class LogoutEvent implements Listener {
-   private LiteFlags flags;
+    private LiteFlags flags;
 
-   public LogoutEvent(LiteFlags flags) {
-      this.flags = flags;
-   }
+    public LogoutEvent(LiteFlags flags) {
+        this.flags = flags;
+    }
 
-   @EventHandler
-   public void onPlayerLogout(PlayerQuitEvent e) {
-      Player player = e.getPlayer();
-      if (AuthTimer.taskID.containsKey(player.getUniqueId())) {
-         AuthTimer.endTask(player);
-      }
+    @EventHandler
+    public void onPlayerLogout(PlayerQuitEvent e) {
+        Player player = e.getPlayer();
 
-      if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
-         Database.addPlayerCache(player.getUniqueId(), player.getName());
-         MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
-      }
+        if (AuthTimer.taskID.containsKey(player.getUniqueId())) {
+            AuthTimer.endTask(player);
+        }
 
-      if (MapCache.activeFlags.contains(player.getName())) {
-         MapCache.activeFlags.remove(player.getName());
-      }
+        if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
+            Database.addPlayerCache(player.getUniqueId(), player.getName());
+            MapCache.reauthedPlayers.remove(player.getUniqueId().toString());
+        }
 
-   }
+        MapCache.activeFlags.remove(player.getName());
+
+    }
 }
diff --git a/src/main/java/com/liteflags/events/MoveEvent.java b/src/main/java/com/liteflags/events/MoveEvent.java
index e2574c9..db7ae28 100644
--- a/src/main/java/com/liteflags/events/MoveEvent.java
+++ b/src/main/java/com/liteflags/events/MoveEvent.java
@@ -1,6 +1,5 @@
 package com.liteflags.events;
 
-import com.liteflags.LiteFlags;
 import com.liteflags.data.maps.MapCache;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -8,20 +7,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 
 public class MoveEvent implements Listener {
-   private LiteFlags flags;
-
-   public MoveEvent(LiteFlags flags) {
-      this.flags = flags;
-   }
-
-   @EventHandler
-   public void onPlayerMove(PlayerMoveEvent e) {
-      Player player = e.getPlayer();
-      if (MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString())) {
-         e.setCancelled(true);
-      } else {
-         e.setCancelled(false);
-      }
-
-   }
+    @EventHandler
+    public void onPlayerMove(PlayerMoveEvent e) {
+        Player player = e.getPlayer();
+        e.setCancelled(MapCache.reauthedPlayers.containsKey(player.getUniqueId().toString()));
+    }
 }
diff --git a/src/main/java/com/liteflags/util/Utilities.java b/src/main/java/com/liteflags/util/Utilities.java
index 4ce49b9..a6ae5bc 100644
--- a/src/main/java/com/liteflags/util/Utilities.java
+++ b/src/main/java/com/liteflags/util/Utilities.java
@@ -1,6 +1,7 @@
 package com.liteflags.util;
 
 import java.util.concurrent.TimeUnit;
+
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -12,84 +13,58 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class Utilities {
-   public static String convertTime(int time) {
-      int days = (int) TimeUnit.MINUTES.toDays(time);
-      int hours = (int)(TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days));
-      int minutes = (int)(TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days));
-      String d = days + " day";
-      String h = hours + " hour";
-      String m = minutes + " minute";
-      String c = ", ";
-      if (days == 0) {
-         if (hours == 0) {
-            return minutes == 1 ? m : m + "s";
-         } else if (hours == 1) {
-            if (minutes == 1) {
-               return h + c + m;
-            } else {
-               return minutes == 0 ? h : h + c + m + "s";
-            }
-         } else if (minutes == 1) {
-            return h + "s" + c + m;
-         } else {
-            return minutes == 0 ? h + "s" : h + "s" + c + m + "s";
-         }
-      } else if (days == 1) {
-         if (hours == 1) {
-            if (minutes == 1) {
-               return d + c + h + c + m;
-            } else {
-               return minutes == 0 ? d + c + h : d + c + h + c + m + "s";
-            }
-         } else if (minutes == 1) {
-            return hours == 0 ? d + c + m : d + c + h + "s" + c + m;
-         } else if (minutes == 0) {
-            return hours == 0 ? d : d + c + h + "s";
-         } else {
-            return hours == 0 ? d + c + m + "s" : d + c + h + "s" + c + m + "s";
-         }
-      } else if (hours == 1) {
-         if (minutes == 1) {
-            return d + "s" + c + h + c + m;
-         } else {
-            return minutes == 0 ? d + "s" + c + h : d + "s" + c + h + c + m + "s";
-         }
-      } else if (minutes == 1) {
-         return hours == 0 ? d + "s" + c + m : d + "s" + c + h + "s" + c + m;
-      } else if (minutes == 0) {
-         return hours == 0 ? d + "s" : d + "s" + c + h + "s";
-      } else {
-         return hours == 0 ? d + "s" + c + m + "s" : d + "s" + c + h + "s" + c + m + "s";
-      }
-   }
+    public static String convertTime(int time) {
+        int days = (int) TimeUnit.MINUTES.toDays(time);
+        int hours = (int) (TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days));
+        int minutes = (int) (TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days));
 
-   public static String format(String m) {
-      return ChatColor.translateAlternateColorCodes('&', m);
-   }
+        String timeString = formatTime(days, " day");
+        timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(hours, " hour");
+        timeString += (timeString.length() == 0 ? "" : ", ") + formatTime(minutes, " minute");
 
-   public static void sendStaffHoverMessage(OfflinePlayer targetPlayer, Player staffPlayer, String mainString) {
-      TextComponent mainComponent = new TextComponent(mainString);
-      mainComponent.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GRAY + "Click to view " + targetPlayer.getName() + "'s flags")).create()));
-      mainComponent.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flaglist " + targetPlayer.getName()));
-      staffPlayer.spigot().sendMessage(mainComponent);
-   }
+        if (timeString.length() == 0) timeString = "0 minutes";
 
-   public static void sendFlagConfirmMessage(CommandSender sender, OfflinePlayer targetPlayer, int id, String flagReason) {
-      TextComponent mainComponent = new TextComponent("Are you sure you want to remove the flag '" + flagReason + "' from " + ChatColor.YELLOW + targetPlayer.getName() + "'s" + ChatColor.GRAY + " flag history? ");
-      mainComponent.setColor(ChatColor.GRAY);
-      TextComponent confirmButton = new TextComponent("[Confirm]");
-      confirmButton.setColor(ChatColor.GREEN);
-      confirmButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GREEN + "Click to confirm")).create()));
-      confirmButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName() + " -c"));
-      mainComponent.addExtra(confirmButton);
-      sender.spigot().sendMessage(mainComponent);
-   }
+        return timeString;
+    }
 
-   public static TextComponent textComponent(TextComponent component) {
-      return component;
-   }
+    private static String formatTime(int value, String s) {
+        switch (value) {
+            case 0:
+                return "";
+            case 1:
+                return value + s;
+            default:
+                return value + s + "s";
+        }
+    }
 
-   public static void sendMessage(Player player, TextComponent component) {
-      player.spigot().sendMessage(component);
-   }
+    public static String format(String m) {
+        return ChatColor.translateAlternateColorCodes('&', m);
+    }
+
+    public static void sendStaffHoverMessage(OfflinePlayer targetPlayer, Player staffPlayer, String mainString) {
+        TextComponent mainComponent = new TextComponent(mainString);
+        mainComponent.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GRAY + "Click to view " + targetPlayer.getName() + "'s flags")).create()));
+        mainComponent.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flaglist " + targetPlayer.getName()));
+        staffPlayer.spigot().sendMessage(mainComponent);
+    }
+
+    public static void sendFlagConfirmMessage(CommandSender sender, OfflinePlayer targetPlayer, int id, String flagReason) {
+        TextComponent mainComponent = new TextComponent("Are you sure you want to remove the flag '" + flagReason + "' from " + ChatColor.YELLOW + targetPlayer.getName() + "'s" + ChatColor.GRAY + " flag history? ");
+        mainComponent.setColor(ChatColor.GRAY);
+        TextComponent confirmButton = new TextComponent("[Confirm]");
+        confirmButton.setColor(ChatColor.GREEN);
+        confirmButton.setHoverEvent(new HoverEvent(Action.SHOW_TEXT, (new ComponentBuilder(ChatColor.GREEN + "Click to confirm")).create()));
+        confirmButton.setClickEvent(new ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, "/flag remove " + id + " " + targetPlayer.getName() + " -c"));
+        mainComponent.addExtra(confirmButton);
+        sender.spigot().sendMessage(mainComponent);
+    }
+
+    public static TextComponent textComponent(TextComponent component) {
+        return component;
+    }
+
+    public static void sendMessage(Player player, TextComponent component) {
+        player.spigot().sendMessage(component);
+    }
 }