Bump version

* Use long instead of int and use offset to check time (FS-181)

* Remove star import

CONTRIBUTING.md

@@ -1,3 +1,3 @@
-# Contributing to TotalFreedomMod #
+# Contributing to TotalFreedomMod
 
-For information about contributing to TotalFreedomMod, please see the [contributing guidelines](https://github.com/TotalFreedom/TotalFreedomMod/wiki/Contributing).
+For information about contributing to TotalFreedomMod, please see the [contributing guidelines](https://github.com/TotalFreedom/TotalFreedomMod/wiki/Contributing).

LICENSE.md

@@ -1,4 +1,5 @@
-# TotalFreedom General License #
+# TotalFreedom General License
+
 _Version 2.0, 27th February 2015_
 
 Copyright (c) 2011 Steven Lawson
@@ -7,7 +8,8 @@ Copyright (c) 2012 Jerom van der Sar
 
 All rights reserved.
 
-##### 1. Definitions #####
+##### 1. Definitions
+
 "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by this document.
 
 "Licensor" shall mean the copyright holder or entity authorised by the copyright owner that is granting the License.
@@ -30,12 +32,13 @@ All rights reserved.
 
 "Redistribution" shall mean any partial or complete availability, transfer or publication of the Work from one Legal Entity to another.
 
-##### 2. Grant of Copyright License #####
- Subject to the terms and conditions of this License, You are granted a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform, inspect and redistribute the Work and such Derivative Works as long as the following conditions are met:
+##### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, You are granted a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform, inspect and redistribute the Work and such Derivative Works as long as the following conditions are met:
 
 1. Redistributions of This Software must solely occur in Source form. Redistribution in Object form is prohibited without prior written permission from the Licensor.
 
-2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This Software's source code. 
+2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This Software's source code.
 
 3. Neither the names of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from This Software without specific prior written permission.
 
@@ -47,8 +50,10 @@ All rights reserved.
 
 7. Sub licensing of This Software is prohibited without prior written permission from the Licensor.
 
-##### 3. Submission of Contributions #####
+##### 3. Submission of Contributions
+
 Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
 
-##### 4. Disclaimer of Warranty #####
+##### 4. Disclaimer of Warranty
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,16 +1,17 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
+# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 
 This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves.
 
-### Contributing ###
+### Contributing
+
 Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod.
 
 For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
 
 For information on our security policy and reporting an issue, please see [SECURITY.md](SECURITY.md)
 
-### Compiling ###
+### Compiling
 
 You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.

SECURITY.md

@@ -6,15 +6,17 @@ We currently support the code running on the "development" branch of this reposi
 
 In terms of plugin releases, we support the following versions:
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 2020.11   | :white_check_mark: |
-| 6.0.x (Pre-Release)  | :x:                |
-| < 2020.11  | :x:                |
-| < 5.x  | :x:                |
+| Version             | Supported          |
+| ------------------- | ------------------ |
+| 2021.04             | :white_check_mark: |
+| 2021.02             | :white_check_mark: |
+| 2020.11             | :white_check_mark: |
+| 6.0.x (Pre-Release) | :x:                |
+| < 2020.11           | :x:                |
+| < 5.x               | :x:                |
 
 ## Reporting a Vulnerability
 
 If the report has minor security implications (ie we've added a super admin to a senior admins permission) please raise an post on [our forums](https://forum.totalfreedom.me/) in the first instance. If you do not have a forum account and do not wish to sign up, please e-mail us using the e-mail in the next sentence.
 
-For security vulnerabilities that are more severe and that may pose a more significant threat to the servers running this plugin, please e-mail os-security-reports [ AT ] atlas-media.co.uk - You can expect an automated response immediately to acknowledge receipt of your e-mail, and one of our team will aim to respond within 72 hours and will work with you on the best way to address your concerns. 
+For security vulnerabilities that are more severe and that may pose a more significant threat to the servers running this plugin, please e-mail os-security-reports [ AT ] atlas-media.co.uk - You can expect an automated response immediately to acknowledge receipt of your e-mail, and one of our team will aim to respond within 72 hours and will work with you on the best way to address your concerns.

checkstyle.xml

@@ -2,20 +2,16 @@
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
     <property name="severity" value="warning"/>
     <property name="fileExtensions" value="java, properties, xml"/>
-
     <module name="SuppressionFilter">
         <property name="file" value="supressions.xml"/>
     </module>
-
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
-
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -91,7 +87,7 @@
                      value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9][_]*[T]$)"/>
+            <property name="format" value="(^[A-Z][a-zA-Z0-9]*$)|([A-Z][a-zA-Z0-9]*[_][a-zA-Z0-9]*$)"/>
             <message key="name.invalidPattern"
                      value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -112,7 +108,8 @@
                      value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="CustomImportOrder"/><!-- http://checkstyle.sourceforge.net/config_imports.html -->
+        <module name="CustomImportOrder"/>
+        <!-- http://checkstyle.sourceforge.net/config_imports.html -->
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
@@ -133,4 +130,4 @@
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
+</module>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.02-RC03</version>
+    <version>2021.05-RC01</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -75,9 +75,9 @@
         </repository>
 
         <repository>
-            <id>jcenter</id>
-            <name>jcenter-bintray</name>
-            <url>https://jcenter.bintray.com</url>
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases/</url>
         </repository>
 
         <repository>
@@ -191,7 +191,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_224</version>
+            <version>4.2.1_255</version>
             <scope>provided</scope>
         </dependency>
 
@@ -252,9 +252,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.AtlasMediaGroup</groupId>
             <artifactId>TFGuilds</artifactId>
-            <version>db036fb187</version>
+            <version>master-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -277,6 +277,11 @@
             <version>5.4.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.4</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -434,7 +439,8 @@
                             <relocations>
                                 <relocation>
                                     <pattern>io.papermc.lib</pattern>
-                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern> <!-- Replace this -->
+                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib
+                                    </shadedPattern> <!-- Replace this -->
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>

src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.ArrayList;
-import java.util.List;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -11,10 +10,12 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class AntiSpam extends FreedomService
 {
 
@@ -22,7 +23,7 @@ public class AntiSpam extends FreedomService
     public static final int TICKS_PER_CYCLE = 2 * 10;
     //
     public BukkitTask cycleTask = null;
-    List<Player> markedForDeath = new ArrayList<>();
+    private Map<Player, Integer> muteCounts = new HashMap<>();
 
     @Override
     public void onStart()
@@ -67,23 +68,26 @@ public class AntiSpam extends FreedomService
             return;
         }
 
-        String message = event.getMessage().trim();
-
         final FPlayer playerdata = plugin.pl.getPlayerSync(player);
+        int count = muteCounts.getOrDefault(player, 0);
+        int minutes = ConfigEntry.ANTISPAM_MINUTES.getInteger();
 
         // Check for spam
-        if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE)
+        if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE && !playerdata.isMuted())
         {
-            if (!markedForDeath.contains(player))
-            {
-                markedForDeath.add(player);
-                FSync.bcastMsg(player.getName() + " was automatically kicked for spamming chat.", ChatColor.RED);
-                FSync.autoEject(player, "Kicked for spamming chat.");
+            count++;
+            muteCounts.put(player, count);
 
-                playerdata.resetMsgCount();
+            int time = count * minutes;
+            playerdata.setMuted(true, time);
 
-                event.setCancelled(true);
-            }
+            FSync.bcastMsg(String.format("%s has automatically been muted for %d minutes for spamming chat.",
+                    player.getName(),
+                    time),
+                    ChatColor.RED);
+
+            playerdata.resetMsgCount();
+            event.setCancelled(true);
         }
         else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
@@ -122,10 +126,4 @@ public class AntiSpam extends FreedomService
             event.setCancelled(true);
         }
     }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onPlayerKick(PlayerKickEvent event)
-    {
-        markedForDeath.remove(event.getPlayer());
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/BackupManager.java

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.io.File;
 import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
 import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
@@ -9,8 +8,11 @@ import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.util.FileUtil;
 
+import java.io.File;
+
 public class BackupManager extends FreedomService
 {
+
     @Override
     public void onStart()
     {
@@ -42,16 +44,16 @@ public class BackupManager extends FreedomService
         config.load();
 
         // Weekly
-        if (!config.isInt(save + ".weekly"))
+        if (!config.isLong(save + ".weekly"))
         {
             performBackup(file, "weekly");
             config.set(save + ".weekly", FUtil.getUnixTime());
         }
         else
         {
-            int lastBackupWeekly = config.getInt(save + ".weekly");
+            long lastBackupWeekly = config.getLong(save + ".weekly");
 
-            if (lastBackupWeekly + 3600 * 24 * 7 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupWeekly, "1w") < FUtil.getUnixTime())
             {
                 performBackup(file, "weekly");
                 config.set(save + ".weekly", FUtil.getUnixTime());
@@ -65,16 +67,16 @@ public class BackupManager extends FreedomService
         }
 
         // Daily
-        if (!config.isInt(save + ".daily"))
+        if (!config.isLong(save + ".daily"))
         {
             performBackup(file, "daily");
             config.set(save + ".daily", FUtil.getUnixTime());
         }
         else
         {
-            int lastBackupDaily = config.getInt(save + ".daily");
+            long lastBackupDaily = config.getLong(save + ".daily");
 
-            if (lastBackupDaily + 3600 * 24 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupDaily, "1d") < FUtil.getUnixTime())
             {
                 performBackup(file, "daily");
                 config.set(save + ".daily", FUtil.getUnixTime());
@@ -98,5 +100,4 @@ public class BackupManager extends FreedomService
         final File newYaml = new File(backupFolder, file + "." + type + ".bak");
         FileUtil.copy(oldYaml, newYaml);
     }
-
 }

src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java

@@ -159,24 +159,20 @@ public class ChatManager extends FreedomService
         FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
         plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message);
 
-        for (Player player : server.getOnlinePlayers())
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
         {
-            if (plugin.al.isAdmin(player))
-            {
-                Admin admin = plugin.al.getAdmin(player);
-                if (!Strings.isNullOrEmpty(admin.getAcFormat()))
-                {
-                    String format = admin.getAcFormat();
-                    ChatColor color = getColor(display);
-                    String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
-                    player.sendMessage(FUtil.colorize(msg));
-                }
-                else
-                {
-                    player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
-                }
+            Admin admin = plugin.al.getAdmin(player);
+            if (!Strings.isNullOrEmpty(admin.getAcFormat())) {
+                String format = admin.getAcFormat();
+                ChatColor color = getColor(display);
+                String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
+                player.sendMessage(FUtil.colorize(msg));
             }
-        }
+            else
+            {
+                player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
+            }
+        });
     }
 
     public void reportAction(Player reporter, Player reported, String report)

src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java

@@ -240,17 +240,9 @@ public class LoginProcess extends FreedomService
             if (noteCount != 0)
             {
                 String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + ".";
-                JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.")
-                        .tooltip("Click here to view them.")
-                        .runCommand("/notes " + player.getName() + " list");
                 FLog.info(noteMessage);
-                for (Player p : server.getOnlinePlayers())
-                {
-                    if (plugin.al.isAdminImpostor(p))
-                    {
-                        notice.send(p);
-                    }
-                }
+                plugin.al.messageAllAdmins(ChatColor.GOLD + noteMessage);
+                plugin.al.messageAllAdmins(ChatColor.GOLD + "Do " + ChatColor.YELLOW + "/notes " + player.getName() + " list" + ChatColor.GOLD + " to view them.");
             }
         }
 

src/main/java/me/totalfreedom/totalfreedommod/Muter.java

@@ -1,13 +1,11 @@
 package me.totalfreedom.totalfreedommod;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -20,7 +18,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
 public class Muter extends FreedomService
 {
 
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
     public final List<String> MUTED_PLAYERS = new ArrayList<>();
 
     @Override
@@ -88,7 +85,7 @@ public class Muter extends FreedomService
             cmdName = command.getName().toLowerCase();
         }
 
-        if (MUTE_COMMANDS.contains(cmdName))
+        if (ConfigEntry.MUTED_BLOCKED_COMMANDS.getStringList().contains(cmdName))
         {
             player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
             event.setCancelled(true);

src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java

@@ -28,7 +28,6 @@ import me.totalfreedom.totalfreedommod.command.CommandLoader;
 import me.totalfreedom.totalfreedommod.config.MainConfig;
 import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.freeze.Freezer;
-import me.totalfreedom.totalfreedommod.fun.CurseListener;
 import me.totalfreedom.totalfreedommod.fun.ItemFun;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import me.totalfreedom.totalfreedommod.fun.Landminer;
@@ -116,7 +115,6 @@ public class TotalFreedomMod extends JavaPlugin
     public Monitors mo;
     public MovementValidator mv;
     public ServerPing sp;
-    public CurseListener cul;
     public ItemFun it;
     public Landminer lm;
     public MP44 mp;
@@ -129,7 +127,6 @@ public class TotalFreedomMod extends JavaPlugin
     public Sitter st;
     public VanishHandler vh;
     public Pterodactyl ptero;
-    //public HubWorldRestrictions hwr;
     //
     // Bridges
     public BukkitTelnetBridge btb;
@@ -368,7 +365,6 @@ public class TotalFreedomMod extends JavaPlugin
         private void initFun()
         {
             // Fun
-            cul = new CurseListener();
             it = new ItemFun();
             lm = new Landminer();
             mp = new MP44();

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -25,17 +25,9 @@ public class Admin
     private boolean active = true;
     private Rank rank = Rank.ADMIN;
     private Date lastLogin = new Date();
-
-
     private Boolean commandSpy = false;
-
-
     private Boolean potionSpy = false;
-
-
     private String acFormat = null;
-
-
     private String pteroID = null;
 
     public Admin(Player player)

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -22,8 +22,7 @@ import org.bukkit.entity.Player;
 public class AdminList extends FreedomService
 {
     public static final List<String> vanished = new ArrayList<>();
-    public final List<String> verifiedNoAdmin = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
+    public final Map<String, List<String>> verifiedNoAdmin = Maps.newHashMap();
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
     private final Set<Admin> activeAdmins = Sets.newHashSet();
@@ -240,8 +239,7 @@ public class AdminList extends FreedomService
 
     public boolean isVerifiedAdmin(Player player)
     {
-        // Fix of issue FS-33
-        return !verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.containsKey(player.getName()) && !verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
+        return verifiedNoAdmin.containsKey(player.getName()) && verifiedNoAdmin.get(player.getName()).contains(FUtil.getIp(player));
     }
 
     public boolean isIdentityMatched(Player player)
@@ -404,13 +402,8 @@ public class AdminList extends FreedomService
         return ipTable;
     }
 
-    public List<String> getVerifiedNoAdmin()
+    public Map<String, List<String>> getVerifiedNoAdmin()
     {
         return verifiedNoAdmin;
     }
-
-    public Map<String, List<String>> getVerifiedNoAdminIps()
-    {
-        return verifiedNoAdminIps;
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java

@@ -169,7 +169,7 @@ public class Ban
 
     public boolean isExpired()
     {
-        return hasExpiry() && expiryUnix < FUtil.getUnixTime();
+        return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime()));
     }
 
     public String bakeKickMessage()

src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java

@@ -14,6 +14,7 @@ import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.data.AnaloguePowerable;
 import org.bukkit.block.data.Powerable;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -30,6 +31,7 @@ import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FireworkExplodeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
@@ -212,6 +214,15 @@ public class EventBlocker extends FreedomService
         }
     }
 
+    @EventHandler
+    public void onEntitySpawn(EntitySpawnEvent event)
+    {
+        if (!ConfigEntry.ALLOW_GRAVITY.getBoolean() && event.getEntity() instanceof FallingBlock)
+        {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event)
     {

src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java

@@ -1,11 +1,7 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.Collections;
@@ -228,11 +224,12 @@ public class CoreProtectBridge extends FreedomService
             String database = ConfigEntry.COREPROTECT_MYSQL_DATABASE.getString();
             String url = host + ":" + port + "/" + database + "?user=" + username + "&password=" + password + "&useSSL=false";
             connection = DriverManager.getConnection("jdbc:sql://" + url);
-            final Statement statement = connection.createStatement();
+            final PreparedStatement statement = connection.prepareStatement("SELECT id FROM co_world WHERE world = ?");
             statement.setQueryTimeout(30);
 
             // Obtain world ID from CoreProtect database
-            ResultSet resultSet = statement.executeQuery("SELECT id FROM co_world WHERE world = '" + world.getName() + "'");
+            statement.setString(1, world.getName());
+            ResultSet resultSet = statement.executeQuery();
             String worldID = null;
             while (resultSet.next())
             {
@@ -250,7 +247,10 @@ public class CoreProtectBridge extends FreedomService
             // Iterate through each table and delete their data if the world ID matches
             for (String table : tables)
             {
-                statement.executeQuery("DELETE FROM " + table + " WHERE wid = " + worldID);
+                final PreparedStatement statement1 = connection.prepareStatement("DELETE FROM ? WHERE wid = ?");
+                statement1.setString(1, table);
+                statement1.setString(2, worldID);
+                statement1.executeQuery();
             }
 
             connection.close();

src/main/java/me/totalfreedom/totalfreedommod/bridge/TFGuildsBridge.java

@@ -53,6 +53,6 @@ public class TFGuildsBridge extends FreedomService
         {
             return false;
         }
-        return Common.IN_GUILD_CHAT.contains(player);
+        return Common.GUILD_CHAT.contains(player);
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldGuardBridge.java

@@ -15,7 +15,6 @@ public class WorldGuardBridge extends FreedomService
     @Override
     public void onStart()
     {
-        plugin.wr.protectWorld(plugin.wm.hubworld.getWorld());
         plugin.wr.protectWorld(plugin.wm.masterBuilderWorld.getWorld());
     }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java

@@ -137,7 +137,7 @@ public class Command_adminworld extends FreedomCommand
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msg(ex.getMessage());
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

@@ -19,7 +19,7 @@ public class Command_adventure extends FreedomCommand
         {
             if (isConsole())
             {
-                sender.sendMessage("When used from the console, you must define a target player.");
+                msg("When used from the console, you must define a target player.");
                 return true;
             }
 
@@ -46,7 +46,7 @@ public class Command_adventure extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java

@@ -72,8 +72,8 @@ public class Command_banip extends FreedomCommand
             {
                 // Broadcast
                 FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
-                String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
-                player.sendMessage(message);
+                String message = sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
+                msg(player, message, ChatColor.RED);
             }
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java

@@ -92,7 +92,7 @@ public class Command_blockedit extends FreedomCommand
         final Player player2 = getPlayer(args[0]);
         if (player2 == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java

@@ -93,7 +93,7 @@ public class Command_blockpvp extends FreedomCommand
         final Player p = getPlayer(args[0]);
         if (p == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -42,14 +42,14 @@ public class Command_cage extends FreedomCommand
         Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         if (fPlayer.getCageData().isCaged())
         {
-            sender.sendMessage(ChatColor.RED + "That player is already caged.");
+            msg("That player is already caged.", ChatColor.RED);
             return true;
         }
 
@@ -80,7 +80,7 @@ public class Command_cage extends FreedomCommand
                         outerMaterial = Material.matchMaterial(args[2]);
                         break;
                     }
-                    sender.sendMessage(ChatColor.RED + "Invalid block!");
+                    msg("Invalid block!", ChatColor.RED);
                     break;
                 }
             }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java

@@ -23,7 +23,7 @@ public class Command_cartsit extends FreedomCommand
 
             if (targetPlayer == null)
             {
-                sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+                msg(PLAYER_NOT_FOUND);
                 return true;
             }
         }
@@ -32,7 +32,7 @@ public class Command_cartsit extends FreedomCommand
         {
             if (targetPlayer == null)
             {
-                sender.sendMessage("When used from the console, you must define a target player: /cartsit <player>");
+                msg("When used from the console, you must define a target player: /cartsit <player>");
                 return true;
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java

@@ -20,7 +20,7 @@ public class Command_clearchat extends FreedomCommand
             {
                 for (int i = 0; i < 100; i++)
                 {
-                    player.sendMessage("");
+                    msg(player, "");
                 }
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearinventory.java

@@ -52,7 +52,7 @@ public class Command_clearinventory extends FreedomCommand
 
                     player.getInventory().clear();
                     msg("Cleared " + player.getName() + "'s inventory.");
-                    player.sendMessage(sender.getName() + " has cleared your inventory.");
+                    msg(player, sender.getName() + " has cleared your inventory.");
                 }
             }
             else

src/main/java/me/totalfreedom/totalfreedommod/command/Command_commandlist.java

@@ -43,7 +43,7 @@ public class Command_commandlist extends FreedomCommand
 
         Collections.sort(commands);
 
-        sender.sendMessage(StringUtils.join(commands, ", "));
+        msg(StringUtils.join(commands, ", "));
 
         return true;
     }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_creative.java

@@ -19,7 +19,7 @@ public class Command_creative extends FreedomCommand
         {
             if (isConsole())
             {
-                sender.sendMessage("When used from the console, you must define a target player.");
+                msg("When used from the console, you must define a target player.");
                 return true;
             }
 
@@ -46,7 +46,7 @@ public class Command_creative extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_curse.java

@@ -1,64 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Curse someone - sends a cursed texture pack to the specified player.", usage = "/<command> <player>")
-public class Command_curse extends FreedomCommand
-{
-
-    /* The only problem with this is someone can prevent themself from being cursed by declining to download the
-       resource pack. However, if they hit yes, then you can curse them whenever you want and they can't stop it unless
-       they go into their server settings. and set server resource packs to prompt or disabled */
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-
-        if (!FUtil.isExecutive(sender.getName()))
-        {
-            return noPerms();
-        }
-
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-
-        if (player == null)
-        {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        if (plugin.cul.cursedPlayers.containsKey(player))
-        {
-            msg("Already attempting to curse!", ChatColor.RED);
-            return true;
-        }
-
-        player.setResourcePack("http://play.totalfreedom.me/cursed.zip");
-        msg("Attempting to curse " + player.getName(), ChatColor.GREEN);
-        plugin.cul.cursedPlayers.put(player, playerSender);
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1 && plugin.al.isAdmin(sender) && FUtil.isExecutive(sender.getName()))
-        {
-            return FUtil.getPlayerList();
-        }
-        return Collections.emptyList();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java

@@ -39,7 +39,8 @@ public class Command_deop extends FreedomCommand
                 {
                     matchedPlayerNames.add(player.getName());
                     player.setOp(false);
-                    player.sendMessage(FreedomCommand.YOU_ARE_NOT_OP);
+                    msg(player, YOU_ARE_NOT_OP);
+                    plugin.rm.updateDisplay(player);
                 }
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java

@@ -19,7 +19,8 @@ public class Command_deopall extends FreedomCommand
         for (Player player : server.getOnlinePlayers())
         {
             player.setOp(false);
-            player.sendMessage(FreedomCommand.YOU_ARE_NOT_OP);
+            msg(player, YOU_ARE_NOT_OP);
+            plugin.rm.updateDisplay(player);
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_dispfill.java

@@ -43,7 +43,7 @@ public class Command_dispfill extends FreedomCommand
             }
             catch (NumberFormatException ex)
             {
-                sender.sendMessage("Invalid radius.");
+                msg("Invalid radius.");
                 return true;
             }
 
@@ -60,7 +60,7 @@ public class Command_dispfill extends FreedomCommand
                 }
                 else
                 {
-                    sender.sendMessage("Skipping invalid item: " + searchItem);
+                    msg("Skipping invalid item: " + searchItem);
                 }
             }
 
@@ -80,7 +80,8 @@ public class Command_dispfill extends FreedomCommand
                         {
                             if (targetBlock.getType().equals(Material.DISPENSER))
                             {
-                                sender.sendMessage("Filling dispenser @ " + FUtil.formatLocation(targetBlock.getLocation()));
+                                msg("Filling dispenser @ " + FUtil.formatLocation(targetBlock.getLocation()));
+                                plugin.cpb.getCoreProtectAPI().logContainerTransaction(sender.getName(), targetBlock.getLocation());
                                 setDispenserContents(targetBlock, itemsArray);
                                 affected++;
                             }
@@ -89,7 +90,7 @@ public class Command_dispfill extends FreedomCommand
                 }
             }
 
-            sender.sendMessage("Done. " + affected + " dispenser(s) filled.");
+            msg("Done. " + affected + " dispenser(s) filled.");
         }
         else
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java

@@ -36,7 +36,7 @@ public class Command_doom extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java

@@ -23,7 +23,7 @@ public class Command_gcmd extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_glow.java

@@ -26,7 +26,7 @@ public class Command_glow extends FreedomCommand
             playerSender.addPotionEffect(glow);
             glowing = true;
         }
-        msg("You " + (glowing ? "are now" : "no longer") + " glowing.");
+        msg("You are " + (glowing ? "now" : "no longer") + " glowing.");
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java

@@ -1,202 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import io.papermc.lib.PaperLib;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.world.WorldTime;
-import me.totalfreedom.totalfreedommod.world.WorldWeather;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "HubWorld management stuff",
-        usage = "/<command> [time <morning | noon | evening | night> | weather <off | rain | storm>]",
-        aliases = "hw,hub")
-public class Command_hubworld extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        CommandMode commandMode = null;
-
-        if (args.length == 0)
-        {
-            commandMode = CommandMode.TELEPORT;
-        }
-        else if (args.length >= 2)
-        {
-            if ("time".equalsIgnoreCase(args[0]))
-            {
-                commandMode = CommandMode.TIME;
-            }
-            else if ("weather".equalsIgnoreCase(args[0]))
-            {
-                commandMode = CommandMode.WEATHER;
-            }
-        }
-
-        if (commandMode == null)
-        {
-            return false;
-        }
-
-        try
-        {
-            switch (commandMode)
-            {
-                case TELEPORT:
-                {
-                    if (!(sender instanceof Player) || playerSender == null)
-                    {
-                        return false;
-                    }
-
-                    World hubWorld = null;
-                    try
-                    {
-                        hubWorld = plugin.wm.hubworld.getWorld();
-                    }
-                    catch (Exception ignored)
-                    {
-                    }
-
-                    if (hubWorld == null || playerSender.getWorld() == hubWorld)
-                    {
-                        msg("Going to the main world.");
-                        PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
-                    }
-                    else
-                    {
-                        msg("Going to the hub world");
-                        plugin.wm.hubworld.sendToWorld(playerSender);
-                    }
-
-                    break;
-                }
-                case TIME:
-                {
-                    assertCommandPerms(sender, playerSender);
-
-                    if (args.length == 2)
-                    {
-                        WorldTime timeOfDay = WorldTime.getByAlias(args[1]);
-                        if (timeOfDay != null)
-                        {
-                            plugin.wm.hubworld.setTimeOfDay(timeOfDay);
-                            msg("Hub world time set to: " + timeOfDay.name());
-                        }
-                        else
-                        {
-                            msg("Invalid time of day. Can be: sunrise, noon, sunset, midnight");
-                        }
-                    }
-                    else
-                    {
-                        return false;
-                    }
-
-                    break;
-                }
-                case WEATHER:
-                {
-                    assertCommandPerms(sender, playerSender);
-
-                    if (args.length == 2)
-                    {
-                        WorldWeather weatherMode = WorldWeather.getByAlias(args[1]);
-                        if (weatherMode != null)
-                        {
-                            plugin.wm.hubworld.setWeatherMode(weatherMode);
-                            msg("Hub world weather set to: " + weatherMode.name());
-                        }
-                        else
-                        {
-                            msg("Invalid weather mode. Can be: off, rain, storm");
-                        }
-                    }
-                    else
-                    {
-                        return false;
-                    }
-
-                    break;
-                }
-                default:
-                {
-                    return false;
-                }
-            }
-        }
-        catch (PermissionDeniedException ex)
-        {
-            if (ex.getMessage().isEmpty())
-            {
-                return noPerms();
-            }
-            sender.sendMessage(ex.getMessage());
-            return true;
-        }
-
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (!plugin.al.isAdmin(sender))
-        {
-            return Collections.emptyList();
-        }
-        if (args.length == 1)
-        {
-            return Arrays.asList("time", "weather");
-        }
-        else if (args.length == 2)
-        {
-            if (args[0].equals("time"))
-            {
-                return Arrays.asList("morning", "noon", "evening", "night");
-            }
-            else if (args[0].equals("weather"))
-            {
-                return Arrays.asList("off", "rain", "storm");
-            }
-        }
-        return Collections.emptyList();
-    }
-
-    // TODO: Redo this properly
-    private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException
-    {
-        if (!(sender instanceof Player) || playerSender == null || !plugin.al.isAdmin(playerSender))
-        {
-            throw new PermissionDeniedException();
-        }
-    }
-
-    private enum CommandMode
-    {
-        TELEPORT, TIME, WEATHER
-    }
-
-    private static class PermissionDeniedException extends Exception
-    {
-
-        private static final long serialVersionUID = 1L;
-
-        private PermissionDeniedException()
-        {
-            super("");
-        }
-
-        private PermissionDeniedException(String string)
-        {
-            super(string);
-        }
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_inspect.java

@@ -39,7 +39,7 @@ public class Command_inspect extends FreedomCommand
                 }
                 catch (NumberFormatException e)
                 {
-                    sender.sendMessage(ChatColor.RED + "Invalid number");
+                    msg("Invalid number", ChatColor.RED);
                 }
             }
 
@@ -48,19 +48,19 @@ public class Command_inspect extends FreedomCommand
             {
                 if (pageIndex < 1 || pageIndex > paged.getPageCount())
                 {
-                    sender.sendMessage(ChatColor.RED + "Not a valid page number");
+                    msg("Not a valid page number", ChatColor.RED);
                     return true;
                 }
 
-                sender.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- ");
+                msg("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- ", ChatColor.WHITE);
 
                 List<String> page = paged.getPage(pageIndex);
                 for (String entries : page)
                 {
-                    sender.sendMessage(entries);
+                    msg(entries);
                 }
 
-                sender.sendMessage("Page " + pageIndex + "/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
+                msg("Page " + pageIndex + "/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>", ChatColor.WHITE);
                 return true;
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java

@@ -1,7 +1,5 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -14,10 +12,14 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @CommandPermissions(level = Rank.IMPOSTOR, source = SourceType.BOTH)
 @CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-s | -i | -f | -v]", aliases = "who,lsit")
 public class Command_list extends FreedomCommand
 {
+
     public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
     {
         if (args.length > 1)
@@ -29,7 +31,10 @@ public class Command_list extends FreedomCommand
             List<String> names = new ArrayList<>();
             for (Player player : server.getOnlinePlayers())
             {
-                names.add(player.getName());
+                if (!plugin.al.isVanished(player.getName()))
+                {
+                    names.add(player.getName());
+                }
             }
             msg("There are " + names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(names, ", "), ChatColor.WHITE);
             return true;
@@ -83,7 +88,7 @@ public class Command_list extends FreedomCommand
 
         List<String> n = new ArrayList<>();
 
-        if (listFilter == ListFilter.TELNET_SESSIONS && plugin.al.isAdmin(sender) && plugin.al.getAdmin(playerSender).getRank().isAtLeast(Rank.ADMIN))
+        if (listFilter == ListFilter.TELNET_SESSIONS && plugin.al.isAdmin(sender))
         {
             List<Admin> connectedAdmins = plugin.btb.getConnectedAdmins();
             onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(connectedAdmins.size())
@@ -96,7 +101,7 @@ public class Command_list extends FreedomCommand
         }
         else
         {
-            onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().size() - AdminList.vanished.size())
+            onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(FUtil.getFakePlayerCount())
                     .append(ChatColor.BLUE)
                     .append(" out of a maximum ")
                     .append(ChatColor.RED)
@@ -141,13 +146,13 @@ public class Command_list extends FreedomCommand
                 .append(StringUtils.join(n, ChatColor.WHITE + ", "));
         if (senderIsConsole)
         {
-            sender.sendMessage(ChatColor.stripColor(onlineStats.toString()));
-            sender.sendMessage(ChatColor.stripColor(onlineUsers.toString()));
+            msg(ChatColor.stripColor(onlineStats.toString()));
+            msg(ChatColor.stripColor(onlineUsers.toString()));
         }
         else
         {
-            sender.sendMessage(onlineStats.toString());
-            sender.sendMessage(onlineUsers.toString());
+            msg(onlineStats.toString());
+            msg(onlineUsers.toString());
         }
         n.clear();
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_lockup.java

@@ -53,7 +53,7 @@ public class Command_lockup extends FreedomCommand
 
                 if (player == null)
                 {
-                    sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
 
@@ -70,7 +70,7 @@ public class Command_lockup extends FreedomCommand
 
                 if (player == null)
                 {
-                    sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java

@@ -54,7 +54,7 @@ public class Command_manageshop extends FreedomCommand
                             Player player = getPlayer(args[3]);
                             if (player != null)
                             {
-                                player.sendMessage(ChatColor.GREEN + sender.getName() + " gave you " + amount + " coins. Your new balance is " + playerData.getCoins());
+                                msg(player, sender.getName() + " gave you " + amount + " coins. Your new balance is " + playerData.getCoins(), ChatColor.GREEN);
                             }
                         }
                         else
@@ -64,7 +64,7 @@ public class Command_manageshop extends FreedomCommand
                                 PlayerData playerData = plugin.pl.getData(player);
                                 playerData.setCoins(playerData.getCoins() + amount);
                                 plugin.pl.save(playerData);
-                                player.sendMessage(ChatColor.GREEN + sender.getName() + " gave you " + amount + " coins. Your new balance is " + playerData.getCoins());
+                                msg(player, sender.getName() + " gave you " + amount + " coins. Your new balance is " + playerData.getCoins(), ChatColor.GREEN);
                             }
                             msg("Successfully added " + amount + " coins to all online players.", ChatColor.GREEN);
                         }
@@ -97,7 +97,7 @@ public class Command_manageshop extends FreedomCommand
                             Player player = getPlayer(args[3]);
                             if (player != null)
                             {
-                                player.sendMessage(ChatColor.RED + sender.getName() + " took " + amount + " coins from you. Your new balance is " + playerData.getCoins());
+                                msg(player, sender.getName() + " took " + amount + " coins from you. Your new balance is " + playerData.getCoins(), ChatColor.RED);
                             }
                         }
                         else
@@ -111,7 +111,7 @@ public class Command_manageshop extends FreedomCommand
                                     playerData.setCoins(0);
                                 }
                                 plugin.pl.save(playerData);
-                                player.sendMessage(ChatColor.RED + sender.getName() + " took " + amount + " coins from you. Your new balance is " + playerData.getCoins());
+                                msg(player, sender.getName() + " took " + amount + " coins from you. Your new balance is " + playerData.getCoins(), ChatColor.RED);
                             }
                             msg("Successfully took " + amount + " coins from all online players.", ChatColor.GREEN);
                         }
@@ -138,7 +138,7 @@ public class Command_manageshop extends FreedomCommand
                         Player player = getPlayer(args[3]);
                         if (player != null)
                         {
-                            player.sendMessage(ChatColor.GREEN + sender.getName() + " set your coin balance to " + amount);
+                            msg(player, sender.getName() + " set your coin balance to " + amount, ChatColor.GREEN);
                         }
                         return true;
                     }
@@ -183,7 +183,7 @@ public class Command_manageshop extends FreedomCommand
                 Player player = getPlayer(args[3]);
                 if (player != null)
                 {
-                    player.sendMessage(ChatColor.GREEN + sender.getName() + " gave the " + item.getName() + " to you");
+                    msg(player, sender.getName() + " gave the " + item.getName() + " to you", ChatColor.GREEN);
                 }
                 return true;
             }
@@ -208,7 +208,7 @@ public class Command_manageshop extends FreedomCommand
                 Player player = getPlayer(args[3]);
                 if (player != null)
                 {
-                    player.sendMessage(ChatColor.RED + sender.getName() + " took the " + item.getName() + " from you");
+                    msg(player, sender.getName() + " took the " + item.getName() + " from you", ChatColor.RED);
                 }
                 return true;
             }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java

@@ -48,12 +48,12 @@ public class Command_manuallyverify extends FreedomCommand
 
         FUtil.adminAction(sender.getName(), "Manually verifying player " + player.getName(), false);
         player.setOp(true);
-        player.sendMessage(YOU_ARE_OP);
+        msg(player, YOU_ARE_OP);
 
         if (plugin.pl.getPlayer(player).getFreezeData().isFrozen())
         {
             plugin.pl.getPlayer(player).getFreezeData().setFrozen(false);
-            player.sendMessage(ChatColor.GRAY + "You have been unfrozen.");
+            msg(player, "You have been unfrozen.");
         }
 
         plugin.pl.verify(player, null);

src/main/java/me/totalfreedom/totalfreedommod/command/Command_masterbuilderworld.java

@@ -138,7 +138,7 @@ public class Command_masterbuilderworld extends FreedomCommand
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msg(ex.getMessage());
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java

@@ -129,7 +129,7 @@ public class Command_mbconfig extends FreedomCommand
                         plugin.pl.verify(player, null);
                         plugin.rm.updateDisplay(player);
                         player.setOp(true);
-                        player.sendMessage(YOU_ARE_OP);
+                        msg(player, YOU_ARE_OP);
                     }
                 }
                 else if (!data.isMasterBuilder())

src/main/java/me/totalfreedom/totalfreedommod/command/Command_moblimiter.java

@@ -65,7 +65,7 @@ public class Command_moblimiter extends FreedomCommand
 
         if (ConfigEntry.MOB_LIMITER_ENABLED.getBoolean())
         {
-            sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + ConfigEntry.MOB_LIMITER_MAX.getInteger() + ".");
+            msg("Moblimiter enabled. Maximum mobcount set to: " + ConfigEntry.MOB_LIMITER_MAX.getInteger() + ".");
 
             msg("Dragon: " + (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + ".");
             msg("Giant: " + (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + ".");

src/main/java/me/totalfreedom/totalfreedommod/command/Command_mp44.java

@@ -45,7 +45,7 @@ public class Command_mp44 extends FreedomCommand
         {
             playerdata.disarmMP44();
 
-            sender.sendMessage(ChatColor.GREEN + "mp44 Disarmed.");
+            msg("mp44 Disarmed.", ChatColor.GREEN);
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java

@@ -109,7 +109,7 @@ public class Command_mute extends FreedomCommand
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java

@@ -7,7 +7,6 @@ import java.util.regex.Pattern;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -81,7 +80,7 @@ public class Command_nickfilter extends FreedomCommand
 
                         if (player == null || !plugin.al.isVanished(player.getName()) && !plugin.al.isAdmin(sender))
                         {
-                            sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName);
+                            msg("Can't find player by nickname: " + displayName);
                             return true;
                         }
                     }
@@ -101,7 +100,7 @@ public class Command_nickfilter extends FreedomCommand
 
         if (!nickMatched)
         {
-            sender.sendMessage("No nicknames replaced in command.");
+            msg("No nicknames replaced in command.");
             return true;
         }
 
@@ -113,7 +112,7 @@ public class Command_nickfilter extends FreedomCommand
             return true;
         }
 
-        sender.sendMessage("Sending command: \"" + newCommand + "\".");
+        msg("Sending command: \"" + newCommand + "\".");
         server.dispatchCommand(sender, newCommand);
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java

@@ -40,7 +40,8 @@ public class Command_op extends FreedomCommand
                 {
                     matchedPlayerNames.add(player.getName());
                     player.setOp(true);
-                    player.sendMessage(FreedomCommand.YOU_ARE_OP);
+                    msg(player, YOU_ARE_OP);
+                    plugin.rm.updateDisplay(player);
                 }
             }
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java

@@ -21,7 +21,8 @@ public class Command_opall extends FreedomCommand
             if (!player.isOp())
             {
                 player.setOp(true);
-                player.sendMessage(FreedomCommand.YOU_ARE_OP);
+                msg(player, YOU_ARE_OP);
+                plugin.rm.updateDisplay(player);
             }
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java

@@ -16,7 +16,8 @@ public class Command_opme extends FreedomCommand
     {
         FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false);
         sender.setOp(true);
-        sender.sendMessage(FreedomCommand.YOU_ARE_OP);
+        msg(YOU_ARE_OP);
+        plugin.rm.updateDisplay(playerSender);
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java

@@ -65,7 +65,7 @@ public class Command_potion extends FreedomCommand
                     Player target = playerSender;
                     if (args.length == 2)
                     {
-                        if (!plugin.al.isAdmin(sender) && !target.equals(getPlayer(sender.getName())))
+                        if (!plugin.al.isAdmin(sender) && !args[1].equalsIgnoreCase(sender.getName()))
                         {
                             msg(ChatColor.RED + "Only admins can clear potion effects from other players.");
                             return true;
@@ -104,9 +104,9 @@ public class Command_potion extends FreedomCommand
 
                     if (args.length == 5)
                     {
-                        if (!plugin.al.isAdmin(sender) && !getPlayer(args[4]).equals(getPlayer(sender.getName())))
+                        if (!plugin.al.isAdmin(sender) && !args[4].equalsIgnoreCase(sender.getName()))
                         {
-                            sender.sendMessage(ChatColor.RED + "Only admins can apply potion effects to other players.");
+                            msg("Only admins can apply potion effects to other players.", ChatColor.RED);
                             return true;
                         }
 
@@ -114,7 +114,7 @@ public class Command_potion extends FreedomCommand
 
                         if (target == null || plugin.al.isVanished(target.getName()) && !plugin.al.isAdmin(sender))
                         {
-                            msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+                            msg(PLAYER_NOT_FOUND);
                             return true;
                         }
                     }
@@ -122,7 +122,7 @@ public class Command_potion extends FreedomCommand
                     {
                         if (senderIsConsole)
                         {
-                            sender.sendMessage("You must specify a target player when using this command from the console.");
+                            msg("You must specify a target player when using this command from the console.");
                             return true;
                         }
                     }
@@ -130,7 +130,7 @@ public class Command_potion extends FreedomCommand
                     PotionEffectType potion_effect_type = PotionEffectType.getByName(args[1]);
                     if (potion_effect_type == null)
                     {
-                        sender.sendMessage(ChatColor.AQUA + "Invalid potion effect type.");
+                        msg("Invalid potion effect type.", ChatColor.AQUA);
                         return true;
                     }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_premium.java

@@ -1,83 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FSync;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Validates if a given account is premium, or cracked.", usage = "/<command> <player>", aliases = "prem")
-public class Command_premium extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-        final String name;
-
-        if (player != null)
-        {
-            name = player.getName();
-        }
-        else
-        {
-            name = args[0];
-        }
-
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                try
-                {
-                    final URL getUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
-                    final HttpURLConnection urlConnection = (HttpURLConnection)getUrl.openConnection();
-                    urlConnection.setRequestProperty("User-Agent", "");
-                    String message;
-                    /*old code
-                    BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())))
-                    //message = (!"PREMIUM".equalsIgnoreCase(in.readLine()) ? ChatColor.RED + "No" : ChatColor.DARK_GREEN + "Yes");
-                    */
-                    try
-                    {
-                        if (urlConnection.getResponseCode() == 200)
-                        {
-                            message = ChatColor.GREEN + "Yes";
-                        }
-                        else
-                        {
-                            message = ChatColor.RED + "No";
-                        }
-                        FSync.playerMsg(sender, "Player " + name + " is premium: " + message);
-                    }
-                    catch (IOException e)
-                    {
-                        FSync.playerMsg(sender, ChatColor.RED + "There was an error on trying to connect to the API server");
-                    }
-
-                }
-                catch (IOException ex)
-                {
-                    FLog.severe(ex);
-                    msg("There was an error querying the API server.", ChatColor.RED);
-                }
-            }
-        }.runTaskAsynchronously(plugin);
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java

@@ -39,7 +39,7 @@ public class Command_rank extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java

@@ -26,7 +26,7 @@ public class Command_ride extends FreedomCommand
         final FPlayer fPlayer = plugin.pl.getPlayer(playerSender);
         if (fPlayer.getCageData().isCaged())
         {
-            msg("You cannot used this command while caged.");
+            msg("You cannot use this command while caged.");
             return true;
         }
 
@@ -52,7 +52,7 @@ public class Command_ride extends FreedomCommand
             }
 
             msg("Request accepted.");
-            requester.sendMessage(ChatColor.GRAY + "Your request has been accepted.");
+            msg(requester, "Your request has been accepted.");
 
             if (requester.getWorld() != playerSender.getWorld())
             {
@@ -80,7 +80,7 @@ public class Command_ride extends FreedomCommand
             }
             msg("Request denied.");
             RIDE_REQUESTS.remove(playerSender);
-            requester.sendMessage(ChatColor.GRAY + "Your request has been denied.");
+            msg(requester, "Your request has been denied.");
             return true;
         }
 
@@ -123,10 +123,10 @@ public class Command_ride extends FreedomCommand
         if (playerData.getRideMode().equals("ask") && !FUtil.isExecutive(playerSender.getName()))
         {
             msg("Sent a request to the player.", ChatColor.GREEN);
-            player.sendMessage(ChatColor.AQUA + sender.getName() + " has requested to ride you.");
-            player.sendMessage(ChatColor.AQUA + "Type " + ChatColor.GREEN + "/ride accept" + ChatColor.AQUA + " to allow the player to ride you.");
-            player.sendMessage(ChatColor.AQUA + "Type " + ChatColor.RED + "/ride deny" + ChatColor.AQUA + " to deny the player permission.");
-            player.sendMessage(ChatColor.AQUA + "Request will expire in 30 seconds.");
+            msg(player, sender.getName() + " has requested to ride you.", ChatColor.AQUA);
+            msg(player, "Type " + ChatColor.GREEN + "/ride accept" + ChatColor.AQUA + " to allow the player to ride you.", ChatColor.AQUA);
+            msg(player, "Type " + ChatColor.RED + "/ride deny" + ChatColor.AQUA + " to deny the player permission.", ChatColor.AQUA);
+            msg(player, "Request will expire in 30 seconds.", ChatColor.AQUA);
             RIDE_REQUESTS.put(player, playerSender);
 
             new BukkitRunnable()
@@ -139,8 +139,8 @@ public class Command_ride extends FreedomCommand
                     }
 
                     RIDE_REQUESTS.remove(player);
-                    playerSender.sendMessage(ChatColor.RED + "It has been 30 seconds and " + player.getName() + " has not accepted your request.");
-                    player.sendMessage(ChatColor.RED + "Request expired.");
+                    msg(playerSender, "It has been 30 seconds and " + player.getName() + " has not accepted your request.", ChatColor.RED);
+                    msg(player, "Request expired.", ChatColor.RED);
                 }
             }.runTaskLater(plugin, 20 * 30);
             return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java

@@ -220,7 +220,6 @@ public class Command_saconfig extends FreedomCommand
                     if (plugin.al.isVerifiedAdmin(player))
                     {
                         plugin.al.verifiedNoAdmin.remove(player.getName());
-                        plugin.al.verifiedNoAdminIps.remove(player.getName());
                     }
 
                     plugin.al.save(admin);
@@ -244,7 +243,7 @@ public class Command_saconfig extends FreedomCommand
                 if (!player.isOp())
                 {
                     player.setOp(true);
-                    player.sendMessage(YOU_ARE_OP);
+                    msg(player, YOU_ARE_OP);
                 }
                 return true;
             }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_scare.java

@@ -38,7 +38,7 @@ public class Command_scare extends FreedomCommand
         }
 
         msg("Scared " + player.getName());
-        player.sendMessage(ChatColor.RED + "ZING");
+        msg(player, "ZING", ChatColor.RED);
 
         player.spawnParticle(Particle.MOB_APPEARANCE, player.getLocation(), 4);
         for (int i = 0; i < 10; ++i)

src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlever.java

@@ -1,6 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.List;
+
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -39,6 +40,12 @@ public class Command_setlever extends FreedomCommand
             return true;
         }
 
+        if (x > 29999998 || x < -29999998 || y > 29999998 || y < -29999998 || z > 29999998 || z < -29999998)
+        {
+            msg("Coordinates cannot be larger than 29999998 or smaller than -29999998 blocks.");
+            return true;
+        }
+
         World world = null;
         final String needleWorldName = args[3].trim();
         final List<World> worlds = server.getWorlds();
@@ -72,6 +79,8 @@ public class Command_setlever extends FreedomCommand
             caster.setPowered(leverOn);
             state.setBlockData(data);
             state.update();
+
+            plugin.cpb.getCoreProtectAPI().logInteraction(sender.getName(), leverLocation);
         }
         else
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java

@@ -21,7 +21,7 @@ public class Command_setplayerlimit extends FreedomCommand
             Player player = Bukkit.getPlayer(args[0]);
             if (player == null)
             {
-                sender.sendMessage(PLAYER_NOT_FOUND);
+                msg(PLAYER_NOT_FOUND);
                 return true;
             }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java

@@ -55,7 +55,7 @@ public class Command_settotalvotes extends FreedomCommand
 
         if (player != null)
         {
-            player.sendMessage(ChatColor.GREEN + sender.getName() + " has set your total votes to " + votes);
+            msg(player, sender.getName() + " has set your total votes to " + votes, ChatColor.GREEN);
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_smite.java

@@ -15,21 +15,21 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> <player> [reason] [-q]")
+@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> <player> [reason] [-ci | -q]")
 public class Command_smite extends FreedomCommand
 {
 
     public static void smite(CommandSender sender, Player player)
     {
-        smite(sender, player, null, false);
+        smite(sender, player, null, false, false);
     }
 
     public static void smite(CommandSender sender, Player player, String reason)
     {
-        smite(sender, player, reason, false);
+        smite(sender, player, reason, false, false);
     }
 
-    public static void smite(CommandSender sender, Player player, String reason, Boolean silent)
+    public static void smite(CommandSender sender, Player player, String reason, Boolean silent, Boolean clearinv)
     {
         player.sendTitle(ChatColor.RED + "You've been smitten.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
 
@@ -44,7 +44,7 @@ public class Command_smite extends FreedomCommand
         }
         else
         {
-            sender.sendMessage(ChatColor.GRAY + "Smitten " + player.getName() + " quietly.");
+            sender.sendMessage("Smitten " + player.getName() + " quietly.");
         }
 
         // Deop
@@ -54,7 +54,10 @@ public class Command_smite extends FreedomCommand
         player.setGameMode(GameMode.SURVIVAL);
 
         // Clear inventory
-        player.getInventory().clear();
+        if (clearinv)
+        {
+            player.getInventory().clear();
+        }
 
         // Strike with lightning effect
         final Location targetPos = player.getLocation();
@@ -88,6 +91,7 @@ public class Command_smite extends FreedomCommand
 
         String reason = null;
         boolean silent = false;
+        boolean clearinv = false;
         if (args.length >= 2)
         {
             if (args[args.length - 1].equalsIgnoreCase("-q"))
@@ -102,6 +106,18 @@ public class Command_smite extends FreedomCommand
                     reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
                 }
             }
+            else if (args[args.length - 1].equalsIgnoreCase("-ci"))
+            {
+                if (args[args.length - 1].equalsIgnoreCase("-ci"))
+                {
+                    clearinv = true;
+                }
+
+                if (args.length >= 3)
+                {
+                    reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+                }
+            }
             else
             {
                 reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
@@ -112,14 +128,14 @@ public class Command_smite extends FreedomCommand
 
         if (player == null)
         {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
-        smite(sender, player, reason, silent);
+        smite(sender, player, reason, silent, clearinv);
 
         plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.SMITE, reason));
 
         return true;
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java

@@ -18,7 +18,7 @@ public class Command_spectator extends FreedomCommand
         {
             if (isConsole())
             {
-                sender.sendMessage("When used from the console, you must define a target player.");
+                msg("When used from the console, you must define a target player.");
                 return true;
             }
 
@@ -31,7 +31,7 @@ public class Command_spectator extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_survival.java

@@ -19,7 +19,7 @@ public class Command_survival extends FreedomCommand
         {
             if (isConsole())
             {
-                sender.sendMessage("When used from the console, you must define a target player.");
+                msg("When used from the console, you must define a target player.");
                 return true;
             }
 
@@ -46,7 +46,7 @@ public class Command_survival extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java

@@ -1,7 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Arrays;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
@@ -19,9 +20,6 @@ import org.bukkit.entity.Player;
 public class Command_tag extends FreedomCommand
 {
 
-    public static final List<String> FORBIDDEN_WORDS = Arrays.asList(
-            "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -170,7 +168,7 @@ public class Command_tag extends FreedomCommand
 
                     if (!plugin.al.isAdmin(sender))
                     {
-                        for (String word : FORBIDDEN_WORDS)
+                        for (String word : ConfigEntry.FORBIDDEN_WORDS.getStringList())
                         {
                             if (rawTag.contains(word))
                             {
@@ -261,7 +259,7 @@ public class Command_tag extends FreedomCommand
 
                     if (!plugin.al.isAdmin(sender))
                     {
-                        for (String word : FORBIDDEN_WORDS)
+                        for (String word : ConfigEntry.FORBIDDEN_WORDS.getStringList())
                         {
                             if (rawTag.contains(word))
                             {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -43,7 +44,7 @@ public class Command_tagnyan extends FreedomCommand
 
         if (!plugin.al.isAdmin(sender))
         {
-            for (String word : Command_tag.FORBIDDEN_WORDS)
+            for (String word : ConfigEntry.FORBIDDEN_WORDS.getStringList())
             {
                 if (rawTag.contains(word))
                 {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
@@ -33,7 +34,7 @@ public class Command_tagrainbow extends FreedomCommand
                 return true;
             }
 
-            for (String word : Command_tag.FORBIDDEN_WORDS)
+            for (String word : ConfigEntry.FORBIDDEN_WORDS.getStringList())
             {
                 if (rawTag.contains(word))
                 {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java

@@ -13,6 +13,8 @@ import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -44,6 +46,9 @@ public class Command_tempban extends FreedomCommand
             }
         }
 
+        final String username;
+        final List<String> ips = new ArrayList<>();
+
         final Player player = getPlayer(args[0]);
         final PlayerData entry;
         if (player == null)
@@ -55,15 +60,18 @@ public class Command_tempban extends FreedomCommand
                 msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
                 return true;
             }
+
+            username = entry.getName();
+            ips.addAll(entry.getIps());
         }
         else
         {
             entry = plugin.pl.getData(player);
+            username = player.getName();
+            ips.add(FUtil.getIp(player));
         }
-        final List<String> ips = new ArrayList<>(entry.getIps());
 
-        assert player != null;
-        final StringBuilder message = new StringBuilder("Temporarily banned " + player.getName());
+        final StringBuilder message = new StringBuilder("Temporarily banned " + username);
 
         Date expires = FUtil.parseDateOffset("30m");
         message.append(" until ").append(date_format.format(expires));
@@ -80,16 +88,36 @@ public class Command_tempban extends FreedomCommand
             message.append(", Reason: \"").append(reason).append("\"");
         }
 
+        Ban ban;
+
+        if (player != null)
+        {
+            ban = Ban.forPlayer(player, sender, expires, reason);
+        }
+        else
+        {
+            ban = Ban.forPlayerName(username, sender, expires, reason);
+        }
+
+        for (String ip : ips)
+        {
+            ban.addIp(ip);
+        }
+        plugin.bm.addBan(ban);
+
         if (!quiet)
         {
-            // Strike with lightning
-            final Location targetPos = player.getLocation();
-            for (int x = -1; x <= 1; x++)
+            if (player != null)
             {
-                for (int z = -1; z <= 1; z++)
+                // Strike with lightning
+                final Location targetPos = player.getLocation();
+                for (int x = -1; x <= 1; x++)
                 {
-                    final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
-                    Objects.requireNonNull(targetPos.getWorld()).strikeLightningEffect(strike_pos);
+                    for (int z = -1; z <= 1; z++)
+                    {
+                        final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                        Objects.requireNonNull(targetPos.getWorld()).strikeLightningEffect(strike_pos);
+                    }
                 }
             }
 
@@ -97,21 +125,22 @@ public class Command_tempban extends FreedomCommand
         }
         else
         {
-            msg("Quietly temporarily banned " + player.getName() + ".");
+            msg("Quietly temporarily banned " + username + ".");
         }
 
-
-        Ban ban;
-
-        ban = Ban.forPlayer(player, sender, null, reason);
-
-        for (String ip : ips)
+        if (player != null)
         {
-            ban.addIp(ip);
+            player.kickPlayer(ban.bakeKickMessage());
+            for (Player p : Bukkit.getOnlinePlayers())
+            {
+                if (FUtil.getIp(p).equals(FUtil.getIp(player)))
+                {
+                    p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
+                }
+            }
         }
-        plugin.bm.addBan(ban);
-        player.kickPlayer(ban.bakeKickMessage());
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.TEMPBAN, reason));
+
+        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.TEMPBAN, reason));
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java

@@ -54,6 +54,7 @@ public class Command_toggle extends FreedomCommand
             msg("- landmines");
             msg("- mp44");
             msg("- tossmob");
+            msg("- gravity");
             return false;
         }
 
@@ -297,6 +298,12 @@ public class Command_toggle extends FreedomCommand
                 toggle("Tossmob is", ConfigEntry.TOSSMOB_ENABLED);
                 break;
             }
+
+            case "gravity":
+            {
+                toggle("Block gravity is", ConfigEntry.ALLOW_GRAVITY);
+                break;
+            }
         }
         return true;
     }
@@ -320,7 +327,7 @@ public class Command_toggle extends FreedomCommand
                     "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
                     "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke", "explosives", "unsafeenchs",
                     "bells", "armorstands", "structureblocks", "jigsaws", "grindstones", "jukeboxes", "spawners", "4chan", "beehives",
-                    "respawnanchors", "autotp", "autoclear", "minecarts", "mp44", "landmines", "tossmob");
+                    "respawnanchors", "autotp", "autoclear", "minecarts", "mp44", "landmines", "tossmob", "gravity");
         }
         return Collections.emptyList();
     }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_unblockcmd.java

@@ -24,7 +24,7 @@ public class Command_unblockcmd extends FreedomCommand
         Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_uncage.java

@@ -25,7 +25,7 @@ public class Command_uncage extends FreedomCommand
         Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_unmute.java

@@ -37,7 +37,7 @@ public class Command_unmute extends FreedomCommand
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java

@@ -34,36 +34,32 @@ public class Command_verifynoadmin extends FreedomCommand
 
         if (plugin.al.isAdminImpostor(player))
         {
-            if (!plugin.al.verifiedNoAdmin.contains(player.getName()))
-            {
-                plugin.al.verifiedNoAdmin.add(player.getName());
-            }
             String ip = FUtil.getIp(player);
-            if (!plugin.al.verifiedNoAdminIps.containsKey(player.getName()))
+            if (!plugin.al.verifiedNoAdmin.containsKey(player.getName()))
             {
                 List<String> ips = new ArrayList<>();
                 ips.add(ip);
-                plugin.al.verifiedNoAdminIps.put(player.getName(), ips);
+                plugin.al.verifiedNoAdmin.put(player.getName(), ips);
             }
             else
             {
-                List<String> ips = plugin.al.verifiedNoAdminIps.get(player.getName());
+                List<String> ips = plugin.al.verifiedNoAdmin.get(player.getName());
                 if (!ips.contains(ip))
                 {
                     ips.add(ip);
                     plugin.al.verifiedNoAdmin.remove(player.getName());
-                    plugin.al.verifiedNoAdminIps.put(player.getName(), ips);
+                    plugin.al.verifiedNoAdmin.put(player.getName(), ips);
                 }
             }
             plugin.rm.updateDisplay(player);
             FUtil.adminAction(sender.getName(), "Verified " + player.getName() + ", without admin permissions.", true);
             player.setOp(true);
-            player.sendMessage(YOU_ARE_OP);
+            msg(player, YOU_ARE_OP);
             final FPlayer fPlayer = plugin.pl.getPlayer(player);
             if (fPlayer.getFreezeData().isFrozen())
             {
                 fPlayer.getFreezeData().setFrozen(false);
-                player.sendMessage(ChatColor.GRAY + "You have been unfrozen.");
+                msg(player, "You have been unfrozen.");
             }
             msg("Verified " + player.getName() + " but didn't give them admin permissions", ChatColor.GREEN);
         }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java

@@ -3,6 +3,8 @@ package me.totalfreedom.totalfreedommod.command;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -15,14 +17,6 @@ import org.bukkit.entity.Player;
 public class Command_wildcard extends FreedomCommand
 {
 
-    public static final List<String> BLOCKED_COMMANDS = Arrays.asList(
-            "wildcard",
-            "gtfo",
-            "doom",
-            "slconfig",
-            "smite"
-    );
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -52,7 +46,7 @@ public class Command_wildcard extends FreedomCommand
             aliases = Arrays.asList(fCmd.getAliases().split(","));
         }
 
-        for (String blockedCommand : BLOCKED_COMMANDS)
+        for (String blockedCommand : ConfigEntry.WILDCARD_BLOCKED_COMMANDS.getStringList())
         {
             if (blockedCommand.equals(args[0].toLowerCase()) || aliases.contains(blockedCommand))
             {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipecoreprotectdata.java

@@ -1,37 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Wipes the CoreProtect data for the flatlands", usage = "/<command>")
-public class Command_wipecoreprotectdata extends FreedomCommand
-{
-
-    @Override
-    public boolean run(final CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (!plugin.cpb.isEnabled())
-        {
-            msg("CoreProtect is not enabled on this server");
-            return true;
-        }
-
-        FUtil.adminAction(sender.getName(), "Wiping CoreProtect data for the flatlands", true);
-
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                plugin.cpb.clearDatabase(plugin.wm.flatlands.getWorld());
-            }
-        }.runTaskAsynchronously(plugin);
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeflatlands.java

@@ -1,53 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Wipe the flatlands map. Requires manual restart after command is used.", usage = "/<command>")
-public class Command_wipeflatlands extends FreedomCommand
-{
-
-    @Override
-    public boolean run(final CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        plugin.sf.setSavedFlag("do_wipe_flatlands", true);
-
-        if (!ConfigEntry.FLATLANDS_GENERATE.getBoolean())
-        {
-            msg("Flatlands generation is disabled, therefore it cannot be wiped.");
-            return true;
-        }
-
-        FUtil.bcastMsg("Server is going offline for flatlands wipe.", ChatColor.GRAY);
-
-        World flatlands = plugin.wm.flatlands.getWorld();
-
-        if (plugin.wgb.isEnabled())
-        {
-            plugin.wgb.wipeRegions(flatlands);
-        }
-
-        for (Player player : server.getOnlinePlayers())
-        {
-            player.kickPlayer("Server is going offline for flatlands wipe, come back in a few minutes.");
-        }
-
-        if (plugin.cpb.isEnabled())
-        {
-            plugin.cpb.clearDatabase(flatlands, true);
-        }
-        else
-        {
-            server.shutdown();
-        }
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipepunishments.java

@@ -1,40 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Wipes all logged punishments or punishments for a specific user.", usage = "/<command> <username | -a>")
-public class Command_wipepunishments extends FreedomCommand
-{
-
-    @Override
-    public boolean run(final CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        if (args[0].equalsIgnoreCase("-a"))
-        {
-            FUtil.adminAction(sender.getName(), "Wiping the punishment history", true);
-
-            msg("Wiped " + plugin.pul.clear() + " punishments.");
-        }
-        else
-        {
-            String username = args[0];
-
-            FUtil.adminAction(sender.getName(), "Wiping the punishment history for " + username, true);
-
-            msg("Wiped " + plugin.pul.clear(username) + " punishments for " + username + ".");
-        }
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wiperegions.java

@@ -1,73 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Wipe all WorldGuard regions for a specified world.", usage = "/<command> <world>")
-public class Command_wiperegions extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (!plugin.wgb.isEnabled())
-        {
-            msg("WorldGuard is not enabled.");
-            return true;
-        }
-
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        World world = server.getWorld(args[0]);
-        if (world == null)
-        {
-            msg("There is no world named \"" + args[0] + "\"", ChatColor.RED);
-            return true;
-        }
-
-        int regionsWiped = plugin.wgb.wipeRegions(world);
-
-        if (regionsWiped != 0)
-        {
-            FUtil.adminAction(sender.getName(), "Wiped all regions in " + world.getName(), true);
-            msg("Wiped " + regionsWiped + " regions in " + world.getName());
-        }
-        else
-        {
-            msg(ChatColor.RED + "No regions were found in \"" + world.getName() + "\"");
-        }
-        return true;
-    }
-
-    public List<String> getAllWorldNames()
-    {
-        List<String> names = new ArrayList<>();
-        for (World world : server.getWorlds())
-        {
-            names.add(world.getName());
-        }
-        return names;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            return getAllWorldNames();
-        }
-
-        return Collections.emptyList();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipeuserdata.java

@@ -1,46 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.io.File;
-import java.util.Objects;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Removes all essentials playerdata", usage = "/<command>")
-public class Command_wipeuserdata extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (!server.getPluginManager().isPluginEnabled("Essentials"))
-        {
-            msg("Essentials is not enabled on this server.");
-            return true;
-        }
-
-        FUtil.adminAction(sender.getName(), "Wiping Essentials and world player data", true);
-
-        for (World w : Bukkit.getWorlds())
-        {
-            if (w.getName().equals(plugin.wm.adminworld.getWorld().getName()))
-            {
-                continue;
-            }
-
-            FUtil.deleteFolder(new File(Objects.requireNonNull(server.getPluginManager().getPlugin("Essentials")).getDataFolder(), "userdata"));
-            FUtil.deleteFolder(new File(Bukkit.getServer().getWorld(plugin.wm.flatlands.getName()).getWorldFolder().getName() + "playerdata"));
-            FUtil.deleteFolder(new File(Bukkit.getServer().getWorld(plugin.wm.flatlands.getName()).getWorldFolder().getName() + "stats"));
-            FUtil.deleteFolder(new File(Objects.requireNonNull(Bukkit.getServer().getWorld(w.getName())).getWorldFolder().getName() + "stats"));
-            FUtil.deleteFolder(new File(Objects.requireNonNull(Bukkit.getServer().getWorld(w.getName())).getWorldFolder().getName() + "playerdata"));
-            msg("Deleted all player data.");
-            return true;
-        }
-        return false;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_wipewarps.java

@@ -1,34 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import com.earth2me.essentials.Essentials;
-import java.io.File;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Removes all Essentials warps", usage = "/<command>")
-public class Command_wipewarps extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (!plugin.esb.isEnabled())
-        {
-            msg("Essentials is not enabled on this server.");
-            return true;
-        }
-
-        Essentials essentials = plugin.esb.getEssentialsPlugin();
-        File warps = new File(essentials.getDataFolder(), "warps");
-        FUtil.adminAction(sender.getName(), "Wiping Essentials warps", true);
-        FUtil.deleteFolder(warps);
-        //noinspection ResultOfMethodCallIgnored
-        warps.mkdir();
-        essentials.reload();
-        msg("All warps deleted.");
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -34,6 +34,7 @@ public enum ConfigEntry
     ALLOW_RESPAWN_ANCHORS(Boolean.class, "allow.respawnanchors"),
     AUTO_TP(Boolean.class, "allow.auto_tp"),
     AUTO_CLEAR(Boolean.class, "allow.auto_clear"),
+    ALLOW_GRAVITY(Boolean.class, "allow.gravity"),
     //
     BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
     //
@@ -57,7 +58,7 @@ public enum ConfigEntry
     SERVER_LOGIN_SUBTITLE(String.class, "server.login_title.subtitle"),
     SERVER_OWNERS(List.class, "server.owners"),
     SERVER_EXECUTIVES(List.class, "server.executives"),
-    SERVER_ASSTISTANT_EXECUTIVES(List.class, "server.assistant_executives"),
+    SERVER_ASSISTANT_EXECUTIVES(List.class, "server.assistant_executives"),
     SERVER_MASTER_BUILDER_MANAGEMENT(List.class, "server.master_builder_management"),
     SERVER_BAN_URL(String.class, "server.ban_url"),
     SERVER_INDEFBAN_URL(String.class, "server.indefban_url"),
@@ -82,6 +83,7 @@ public enum ConfigEntry
     DISCORD_NEW_ADMIN_ROLE_ID(String.class, "discord.admin_role_id"),
     DISCORD_SENIOR_ADMIN_ROLE_ID(String.class, "discord.senior_admin_role_id"),
     DISCORD_DEVELOPER_ROLE_ID(String.class, "discord.developer_role_id"),
+    DISCORD_ASSISTANT_EXECUTIVE_ROLE_ID(String.class, "discord.assistant_executive_role_id"),
     DISCORD_EXECUTIVE_ROLE_ID(String.class, "discord.executive_role_id"),
     DISCORD_SERVER_OWNER_ROLE_ID(String.class, "discord.server_owner_role_id"),
     //
@@ -153,7 +155,10 @@ public enum ConfigEntry
     EXPLOSIVE_RADIUS(Double.class, "explosive_radius"),
     FREECAM_TRIGGER_COUNT(Integer.class, "freecam_trigger_count"),
     SERVICE_CHECKER_URL(String.class, "service_checker_url"),
-    BLOCKED_COMMANDS(List.class, "blocked_commands"),
+    BLOCKED_COMMANDS(List.class, "blocked_commands.global"),
+    MUTED_BLOCKED_COMMANDS(List.class, "blocked_commands.muted"),
+    WILDCARD_BLOCKED_COMMANDS(List.class, "blocked_commands.wildcard"),
+    FORBIDDEN_WORDS(List.class, "forbidden_words"),
     HOST_SENDER_NAMES(List.class, "host_sender_names"),
     FAMOUS_PLAYERS(List.class, "famous_players"),
     ADMIN_ONLY_MODE(Boolean.class, "admin_only_mode"),
@@ -162,7 +167,8 @@ public enum ConfigEntry
     MASTER_BUILDER_INFO(List.class, "masterbuilderinfo"),
     AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
     TOGGLE_CHAT(Boolean.class, "toggle_chat"),
-    DEVELOPER_MODE(Boolean.class, "developer_mode");
+    DEVELOPER_MODE(Boolean.class, "developer_mode"),
+    ANTISPAM_MINUTES(Integer.class, "antispam_minutes");
     //
     private final Class<?> type;
     private final String configName;

src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java

@@ -13,6 +13,8 @@ import java.util.Objects;
 import java.util.SplittableRandom;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.security.auth.login.LoginException;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
@@ -60,6 +62,7 @@ public class Discord extends FreedomService
     public ScheduledThreadPoolExecutor RATELIMIT_EXECUTOR;
     public List<CompletableFuture<Message>> sentMessages = new ArrayList<>();
     public Boolean enabled = false;
+    private final Pattern DISCORD_MENTION_PATTERN = Pattern.compile("(<@!?([0-9]{16,20})>)");
 
     public static String getMD5(String string)
     {
@@ -408,6 +411,15 @@ public class Discord extends FreedomService
             message = StringUtils.remove(message, "§");
         }
 
+
+        Matcher DISCORD_MENTION_MATCHER = DISCORD_MENTION_PATTERN.matcher(message);
+
+        while (DISCORD_MENTION_MATCHER.find())
+        {
+            String mention = DISCORD_MENTION_MATCHER.group(1);
+            message = message.replace(mention, mention.replace("@",""));
+        }
+
         if (enabled && !chat_channel_id.isEmpty())
         {
             CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(deformat(message)).submit(true);
@@ -433,6 +445,15 @@ public class Discord extends FreedomService
             message = StringUtils.remove(message, "§");
         }
 
+
+        Matcher DISCORD_MENTION_MATCHER = DISCORD_MENTION_PATTERN.matcher(message);
+
+        while (DISCORD_MENTION_MATCHER.find())
+        {
+            String mention = DISCORD_MENTION_MATCHER.group(1);
+            message = message.replace(mention, mention.replace("@",""));
+        }
+
         if (enabled && !chat_channel_id.isEmpty())
         {
             CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(deformat(message)).submit(true);

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToAdminChatListener.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.discord;
 
+import com.google.common.base.Strings;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -18,10 +19,10 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
 
 public class DiscordToAdminChatListener extends ListenerAdapter
 {
+
     DiscordToMinecraftListener dtml = new DiscordToMinecraftListener();
 
     public static net.md_5.bungee.api.ChatColor getColor(Displayable display)
@@ -36,100 +37,112 @@ public class DiscordToAdminChatListener extends ListenerAdapter
         {
             Member member = event.getMember();
             String tag = dtml.getDisplay(member);
-            StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
             Message msg = event.getMessage();
-            for (Player player : Bukkit.getOnlinePlayers())
-            {
-                if (TotalFreedomMod.getPlugin().al.isAdmin(player))
-                {
-                    Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(player);
-                    String format = admin.getAcFormat();
-                    if (format != null)
-                    {
-                        Displayable display = TotalFreedomMod.getPlugin().rm.getDisplay(player);
-                        net.md_5.bungee.api.ChatColor color = getColor(display);
-                        String m = format.replace("%name%", member.getEffectiveName())
-                                .replace("%rank%", getDisplay(member))
-                                .replace("%rankcolor%", color.toString())
-                                .replace("%msg%", FUtil.colorize(msg.getContentDisplay()));
-                        message.append(FUtil.colorize(m));
-                    }
-                    else
-                    {
-                        String m = ChatColor.DARK_RED + member.getEffectiveName() + " "
-                                + ChatColor.DARK_GRAY + tag + ChatColor.DARK_GRAY
-                                + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(msg.getContentDisplay());
-                        message.append(m);
-                    }
-                }
-            }
+            String mediamessage = ChatColor.YELLOW + "[Media]";
+
+            StringBuilder logmessage = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
+            String lm = ChatColor.DARK_RED + member.getEffectiveName() + " "
+                    + ChatColor.DARK_GRAY + tag + ChatColor.DARK_GRAY
+                    + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(msg.getContentDisplay());
+            logmessage.append(lm);
 
-            ComponentBuilder builder = new ComponentBuilder(message.toString());
             if (!msg.getAttachments().isEmpty())
             {
-                for (Message.Attachment attachment : msg.getAttachments())
-                {
-                    if (attachment.getUrl() == null)
-                    {
-                        continue;
-                    }
+                
+                logmessage.append(mediamessage); // Actually for logging...
 
-                    TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
-                    text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
-                    builder.append(text);
-                    message.append("[Media]"); // for logging
-                }
             }
+            FLog.info(logmessage.toString());
 
-            for (Player player : Bukkit.getOnlinePlayers())
+            Bukkit.getOnlinePlayers().stream().filter(player -> TotalFreedomMod.getPlugin().al.isAdmin(player)).forEach(player ->
             {
-                if (TotalFreedomMod.getPlugin().al.isAdmin(player))
+                StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "] " + ChatColor.RESET);
+
+                ComponentBuilder builder = new ComponentBuilder(message.toString());
+
+                Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(player);
+                String format = admin.getAcFormat();
+                if (!Strings.isNullOrEmpty(format))
                 {
-                    player.spigot().sendMessage(builder.create());
+                    Displayable display = getDisplay(member);
+                    net.md_5.bungee.api.ChatColor color = getColor(display);
+                    String m = format.replace("%name%", member.getEffectiveName())
+                            .replace("%rank%", display.getAbbr())
+                            .replace("%rankcolor%", color.toString())
+                            .replace("%msg%", FUtil.colorize(msg.getContentDisplay()));
+                    builder.append(FUtil.colorize(m));
+
                 }
-            }
-            FLog.info(message.toString());
+                else
+                {
+                    String m = ChatColor.DARK_RED + member.getEffectiveName() + " "
+                            + ChatColor.DARK_GRAY + tag + ChatColor.DARK_GRAY
+                            + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(msg.getContentDisplay());
+                    builder.append(m);
+                }
+
+                if (!msg.getAttachments().isEmpty())
+                {
+                    for (Message.Attachment attachment : msg.getAttachments())
+                    {
+                        TextComponent text = new TextComponent(mediamessage);
+                        text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
+                        if (!msg.getContentDisplay().isEmpty())
+                        {
+                            builder.append(" ");
+                        }
+                        builder.append(text);
+                    }
+                }
+                player.spigot().sendMessage(builder.create());
+
+            });
         }
     }
 
     // Needed to display tags in custom AC messages
-    public String getDisplay(Member member)
+    public Displayable getDisplay(Member member)
     {
         Guild server = Discord.bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
         // Server Owner
         if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_SERVER_OWNER_ROLE_ID.getString())))
         {
-            return Title.OWNER.getAbbr();
+            return Title.OWNER;
         }
         // Developers
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_DEVELOPER_ROLE_ID.getString())))
         {
-            return Title.DEVELOPER.getAbbr();
+            return Title.DEVELOPER;
         }
         // Executives
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_EXECUTIVE_ROLE_ID.getString())))
         {
-            return Title.EXECUTIVE.getAbbr();
+            return Title.EXECUTIVE;
+        }
+        // Assistant Executives
+        else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_ASSISTANT_EXECUTIVE_ROLE_ID.getString())))
+        {
+            return Title.ASSTEXEC;
         }
         // Senior Admins
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_SENIOR_ADMIN_ROLE_ID.getString())))
         {
-            return Rank.SENIOR_ADMIN.getAbbr();
+            return Rank.SENIOR_ADMIN;
         }
         // Admins
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_NEW_ADMIN_ROLE_ID.getString())))
         {
-            return Rank.ADMIN.getAbbr();
+            return Rank.ADMIN;
         }
         // Master Builders
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_MASTER_BUILDER_ROLE_ID.getString())))
         {
-            return Title.MASTER_BUILDER.getAbbr();
+            return Title.MASTER_BUILDER;
         }
         // OP, returning null breaks?
         else
         {
-            return Rank.OP.getAbbr();
+            return Rank.OP;
         }
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java

@@ -84,6 +84,11 @@ public class DiscordToMinecraftListener extends ListenerAdapter
         {
             return Title.EXECUTIVE.getColoredTag();
         }
+        // Assistant Executives
+        else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_ASSISTANT_EXECUTIVE_ROLE_ID.getString())))
+        {
+            return Title.ASSTEXEC.getColoredTag();
+        }
         // Senior Admins
         else if (member.getRoles().contains(server.getRoleById(ConfigEntry.DISCORD_SENIOR_ADMIN_ROLE_ID.getString())))
         {

src/main/java/me/totalfreedom/totalfreedommod/fun/CurseListener.java

@@ -1,52 +0,0 @@
-package me.totalfreedom.totalfreedommod.fun;
-
-import java.util.HashMap;
-import me.totalfreedom.totalfreedommod.FreedomService;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerResourcePackStatusEvent;
-import static org.bukkit.event.player.PlayerResourcePackStatusEvent.Status;
-
-public class CurseListener extends FreedomService
-{
-    public HashMap<Player, Player> cursedPlayers = new HashMap<Player, Player>();
-
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onResourcePackStatus(PlayerResourcePackStatusEvent event)
-    {
-        Player player = event.getPlayer();
-        PlayerResourcePackStatusEvent.Status cursed = event.getStatus();
-        Player cursedBy = cursedPlayers.get(player);
-        if (cursed.equals(Status.ACCEPTED))
-        {
-            cursedBy.sendMessage(ChatColor.GREEN + "Casting curse on " + player.getName() + "...");
-        }
-        else if (cursed.equals(Status.DECLINED))
-        {
-            cursedBy.sendMessage(ChatColor.RED + "Failed to start cast on " + player.getName() + "!");
-            cursedPlayers.remove(player);
-        }
-        else if (cursed.equals(Status.SUCCESSFULLY_LOADED))
-        {
-            cursedBy.sendMessage(ChatColor.GREEN + "Successfully cursed + " + player.getName() + "!");
-            cursedPlayers.remove(player);
-        }
-        else if (cursed.equals(Status.FAILED_DOWNLOAD))
-        {
-            cursedBy.sendMessage(ChatColor.RED + "Failed to cast curse on " + player.getName() + "!");
-            cursedPlayers.remove(player);
-        }
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java

@@ -1,7 +1,7 @@
 package me.totalfreedom.totalfreedommod.httpd.module;
 
-import java.util.Collection;
 import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -10,6 +10,8 @@ import org.bukkit.entity.Player;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
+import java.util.Collection;
+
 public class Module_list extends HTTPDModule
 {
 
@@ -95,7 +97,7 @@ public class Module_list extends HTTPDModule
             responseObject.put("master_builders", masterbuilders);
             responseObject.put("operators", operators);
             responseObject.put("imposters", imposters);
-            responseObject.put("online", server.getOnlinePlayers().size());
+            responseObject.put("online", FUtil.getFakePlayerCount());
             responseObject.put("max", server.getMaxPlayers());
 
             final NanoHTTPD.Response response = new NanoHTTPD.Response(NanoHTTPD.Response.Status.OK, NanoHTTPD.MIME_JSON, responseObject.toString());
@@ -108,7 +110,9 @@ public class Module_list extends HTTPDModule
 
             final Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
 
-            body.append("<p>There are ").append(onlinePlayers.size()).append("/").append(Bukkit.getMaxPlayers()).append(" players online:</p>\r\n");
+            int count = onlinePlayers.size() - AdminList.vanished.size();
+            body.append("<p>There are ").append(count < 0 ? 0 : count).append("/")
+                    .append(Bukkit.getMaxPlayers()).append(" players online:</p>\r\n");
 
             body.append("<ul>\r\n");
 

src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionManager.java

@@ -117,10 +117,4 @@ public class PermissionManager extends FreedomService
             setPermissions(player);
         }
     }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onPlayerJoin(PlayerJoinEvent event)
-    {
-        setPermissions(event.getPlayer());
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java

@@ -289,7 +289,7 @@ public class FPlayer
         return unmuteTask != null;
     }
 
-    public void setMuted(boolean muted)
+    public void setMuted(boolean muted, int minutes)
     {
         FUtil.cancel(unmuteTask);
         plugin.mu.MUTED_PLAYERS.remove(getPlayer().getName());
@@ -324,7 +324,12 @@ public class FPlayer
                     plugin.mu.MUTED_PLAYERS.remove(getName());
                 }
             }
-        }.runTaskLater(plugin, AUTO_PURGE_TICKS);
+        }.runTaskLater(plugin, minutes * (60L * 20L));
+    }
+
+    public void setMuted(boolean muted)
+    {
+        setMuted(muted, 5);
     }
 
     public BukkitTask getLockupScheduleID()

src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java

@@ -61,6 +61,11 @@ public class RankManager extends FreedomService
         {
             return Title.EXECUTIVE;
         }
+        
+        if (ConfigEntry.SERVER_ASSISTANT_EXECUTIVES.getList().contains(player.getName()) && plugin.al.isAdmin(player))
+        {
+            return Title.ASSTEXEC;
+        }
 
         if (plugin.al.isVerifiedAdmin(player))
         {
@@ -313,4 +318,4 @@ public class RankManager extends FreedomService
             team.addPlayer(player);
         }
     }
-}
+}

src/main/java/me/totalfreedom/totalfreedommod/shop/Shop.java

@@ -227,7 +227,7 @@ public class Shop extends FreedomService
         ItemStack itemStack = new ItemStack(Material.BLAZE_ROD);
         ItemMeta itemMeta = itemStack.getItemMeta();
         assert itemMeta != null;
-        itemMeta.setDisplayName(FUtil.colorize("&bL&3i&bg&3h&bt&3i&bn&3g &b&bR&3o&bd"));
+        itemMeta.setDisplayName(FUtil.colorize("&bL&3i&bg&3h&bt&3n&bi&3n&bg &3R&bo&3d"));
         itemMeta.setLore(Arrays.asList(ChatColor.AQUA + "Strike others down with the power of lightning.", ChatColor.RED + ChatColor.ITALIC.toString() + "The classic way to exterminate annoyances."));
         itemMeta.addEnchant(Enchantment.CHANNELING, 1, false);
         itemStack.setItemMeta(itemMeta);

src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java

@@ -1,33 +1,5 @@
 package me.totalfreedom.totalfreedommod.util;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.SplittableRandom;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.apache.commons.io.FileUtils;
@@ -48,6 +20,18 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 import org.json.simple.JSONArray;
+
+import java.io.*;
+import java.lang.reflect.Field;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import static org.bukkit.Bukkit.getServer;
 
 public class FUtil
@@ -72,9 +56,11 @@ public class FUtil
             "c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
             "38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
             "ba5aafba-9012-418f-9819-a7020d591068",  // TFTWPhoenix
-            "b051abdf-66d1-48c0-96ef-67fb8af96f2a" // Abhi
+            "d6dd9740-40db-45f5-ab16-4ee16a633009", // Abhi
+            "2e06e049-24c8-42e4-8bcf-d35372af31e6", // NotInSync
+            "f97c0d7b-6413-4558-a409-88f09a8f9adb" // videogamesm12
     );
-    public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix","Spigot_Abhiram");
+    public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix", "abhithedev", "NotInSync", "videogamesm12");
     public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
     public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
             ChatColor.DARK_RED,
@@ -138,7 +124,7 @@ public class FUtil
 
     public static boolean isExecutive(String name)
     {
-        return ConfigEntry.SERVER_OWNERS.getStringList().contains(name) || ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(name) || ConfigEntry.SERVER_ASSTISTANT_EXECUTIVES.getStringList().contains(name);
+        return ConfigEntry.SERVER_OWNERS.getStringList().contains(name) || ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(name) || ConfigEntry.SERVER_ASSISTANT_EXECUTIVES.getStringList().contains(name);
     }
 
     public static boolean isDeveloper(Player player)
@@ -272,7 +258,7 @@ public class FUtil
     public static Response sendRequest(String endpoint, String method, List<String> headers, String body) throws IOException
     {
         URL url = new URL(endpoint);
-        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 
         connection.setRequestMethod(method);
 
@@ -391,7 +377,8 @@ public class FUtil
         }
     }
 
-    private static final List<String> regxList = new ArrayList<String>(){{
+    private static final List<String> regxList = new ArrayList<String>()
+    {{
         add("y");
         add("mo");
         add("w");
@@ -401,11 +388,13 @@ public class FUtil
         add("s");
     }};
 
-    private static long a(String parse) {
+    private static long a(String parse)
+    {
         StringBuilder sb = new StringBuilder();
 
         regxList.forEach(obj -> {
-            if (parse.endsWith(obj)) {
+            if (parse.endsWith(obj))
+            {
                 sb.append(parse.split(obj)[0]);
             }
         });
@@ -413,7 +402,8 @@ public class FUtil
         return Long.parseLong(sb.toString());
     }
 
-    private static TimeUnit verify(String arg) {
+    private static TimeUnit verify(String arg)
+    {
         TimeUnit unit = null;
         for (String c : regxList)
         {
@@ -459,6 +449,16 @@ public class FUtil
         return Date.from(instant);
     }
 
+    public static long parseLongOffset(long unix, String... time)
+    {
+        Instant instant = Instant.ofEpochMilli(unix);
+        for (String arg : time)
+        {
+            instant = instant.plusSeconds(verify(arg).get() * a(arg));
+        }
+        return FUtil.getUnixTime(Date.from(instant));
+    }
+
     public static String playerListToNames(Set<OfflinePlayer> players)
     {
         List<String> names = new ArrayList<>();
@@ -551,7 +551,7 @@ public class FUtil
             {
                 Field field = checkClass.getDeclaredField(name);
                 field.setAccessible(true);
-                return (T)field.get(from);
+                return (T) field.get(from);
 
             }
             catch (NoSuchFieldException | IllegalAccessException ignored)
@@ -611,7 +611,7 @@ public class FUtil
 
     public static long getUnixTime()
     {
-        return Instant.now().getEpochSecond();
+        return Instant.now().toEpochMilli();
     }
 
     public static long getUnixTime(Date date)
@@ -633,7 +633,7 @@ public class FUtil
     public static int randomInteger(int min, int max)
     {
         int range = max - min + 1;
-        return (int)(Math.random() * range) + min;
+        return (int) (Math.random() * range) + min;
     }
 
     public static String randomString(int length)
@@ -771,7 +771,7 @@ public class FUtil
         {
             c1values[i] = Math.round(c1values[i] + factor * (c2values[i] - c1values[i]));
         }
-        return Color.fromRGB((int)c1values[0], (int)c1values[1], (int)c1values[2]);
+        return Color.fromRGB((int) c1values[0], (int) c1values[1], (int) c1values[2]);
     }
 
     public static boolean isValidIPv4(String ip)
@@ -836,8 +836,22 @@ public class FUtil
         }.runTaskLater(TotalFreedomMod.getPlugin(), delay);
     }
 
+    public static int getFakePlayerCount()
+    {
+        int i = TotalFreedomMod.getPlugin().al.vanished.size();
+        for (String name : TotalFreedomMod.getPlugin().al.vanished)
+        {
+            if (Bukkit.getPlayer(name) == null)
+            {
+                i--;
+            }
+        }
+        return getServer().getOnlinePlayers().size() - i;
+    }
+
     public static class PaginationList<T> extends ArrayList<T>
     {
+
         private final int epp;
 
         public PaginationList(int epp)
@@ -855,7 +869,7 @@ public class FUtil
 
         public int getPageCount()
         {
-            return (int)Math.ceil((double)size() / (double)epp);
+            return (int) Math.ceil((double) size() / (double) epp);
         }
 
         public List<T> getPage(int page)

src/main/java/me/totalfreedom/totalfreedommod/world/HubWorld.java

@@ -1,102 +0,0 @@
-package me.totalfreedom.totalfreedommod.world;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
-import org.bukkit.WorldType;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-
-public final class HubWorld extends CustomWorld
-{
-
-    private static final String GENERATION_PARAMETERS = ConfigEntry.FLATLANDS_GENERATE_PARAMS.getString();
-    //
-    private WorldWeather weather = WorldWeather.OFF;
-    private WorldTime time = WorldTime.INHERIT;
-
-    public HubWorld()
-    {
-        super("hubworld");
-    }
-
-    @Override
-    public void sendToWorld(Player player)
-    {
-        super.sendToWorld(player);
-    }
-
-    // TODO: Replace instances of org.bukkit.Sign with a non deprecated version. This might include more boilerplate.
-    @SuppressWarnings("deprecation")
-    @Override
-    protected World generateWorld()
-    {
-        final WorldCreator worldCreator = new WorldCreator(getName());
-        worldCreator.generateStructures(false);
-        worldCreator.type(WorldType.NORMAL);
-        worldCreator.environment(World.Environment.NORMAL);
-        worldCreator.generator(new CleanroomChunkGenerator(GENERATION_PARAMETERS));
-
-        final World world = server.createWorld(worldCreator);
-
-        assert world != null;
-        world.setSpawnFlags(false, false);
-        world.setSpawnLocation(0, 50, 0);
-
-        final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
-        welcomeSignBlock.setType(Material.OAK_SIGN);
-        org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
-
-        org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
-        signData.setFacingDirection(BlockFace.NORTH);
-
-        welcomeSign.setLine(0, ChatColor.GREEN + "Hub World");
-        welcomeSign.setLine(1, ChatColor.DARK_GRAY + "---");
-        welcomeSign.setLine(2, ChatColor.YELLOW + "Spawn Point");
-        welcomeSign.setLine(3, ChatColor.DARK_GRAY + "---");
-        welcomeSign.update();
-
-        plugin.gr.commitGameRules();
-        return world;
-    }
-
-    public WorldWeather getWeatherMode()
-    {
-        return weather;
-    }
-
-    public void setWeatherMode(final WorldWeather weatherMode)
-    {
-        this.weather = weatherMode;
-
-        try
-        {
-            weatherMode.setWorldToWeather(getWorld());
-        }
-        catch (Exception ignored)
-        {
-        }
-    }
-
-    public WorldTime getTimeOfDay()
-    {
-        return time;
-    }
-
-    public void setTimeOfDay(final WorldTime timeOfDay)
-    {
-        this.time = timeOfDay;
-
-        try
-        {
-            timeOfDay.setWorldToTime(getWorld());
-        }
-        catch (Exception ignored)
-        {
-        }
-    }
-
-}

src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java

@@ -20,14 +20,12 @@ public class WorldManager extends FreedomService
     public Flatlands flatlands;
     public AdminWorld adminworld;
     public MasterBuilderWorld masterBuilderWorld;
-    public HubWorld hubworld;
 
     public WorldManager()
     {
         this.flatlands = new Flatlands();
         this.adminworld = new AdminWorld();
         this.masterBuilderWorld = new MasterBuilderWorld();
-        this.hubworld = new HubWorld();
     }
 
     @Override
@@ -36,7 +34,6 @@ public class WorldManager extends FreedomService
         flatlands.getWorld();
         adminworld.getWorld();
         masterBuilderWorld.getWorld();
-        hubworld.getWorld();
 
         // Disable weather
         if (ConfigEntry.DISABLE_WEATHER.getBoolean())
@@ -57,7 +54,6 @@ public class WorldManager extends FreedomService
         flatlands.getWorld().save();
         adminworld.getWorld().save();
         masterBuilderWorld.getWorld().save();
-        hubworld.getWorld().save();
     }
 
     @EventHandler(priority = EventPriority.HIGH)
@@ -73,10 +69,6 @@ public class WorldManager extends FreedomService
             {
                 return;
             }
-            else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
-            {
-                return;
-            }
         }
         catch (Exception ignored)
         {
@@ -101,10 +93,6 @@ public class WorldManager extends FreedomService
             {
                 return;
             }
-            else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
-            {
-                return;
-            }
         }
         catch (Exception ignored)
         {

src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java

@@ -54,7 +54,7 @@ public class WorldRestrictions extends FreedomService
     {
         if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getName()))
         {
-            if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()) || player.getWorld().equals(plugin.wm.hubworld.getWorld()))
+            if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
             {
                 return true;
             }
@@ -139,7 +139,7 @@ public class WorldRestrictions extends FreedomService
                 event.setCancelled(true);
             }
 
-            if (command.equals("coreprotect") || command.equals("core") || command.equals("co"))
+            if (command.equalsIgnoreCase("coreprotect") || command.equalsIgnoreCase("core") || command.equalsIgnoreCase("co"))
             {
                 player.sendMessage(ChatColor.RED + "Only " + allowed + " are allowed to use CoreProtect here.");
                 event.setCancelled(true);

src/main/resources/config.yml

@@ -35,7 +35,7 @@ server:
 
   # All players who show up as executive
   executives: [ ]
-  
+
   # All players who show up as assistant executive
   assistant_executives: []
 
@@ -78,6 +78,8 @@ discord:
   senior_admin_role_id: ''
   # Developer role ID
   developer_role_id: ''
+  # Assistant Executive role ID
+  assistant_executive_role_id: ''
   # Executive Admin role ID
   executive_role_id: ''
   # Owner role ID
@@ -226,215 +228,245 @@ allow:
   respawnanchors: false
   auto_tp: false
   auto_clear: false
+  gravity: false
 
-# Blocked commands:
-#
-# How blocked commands work:
-# All sections described below are delimited by colon characters.
-# Make sure that you block a command by its main command name, not an alias
-# as all aliases are blocked by default. Commands are case-insensitive.
-#
-# * The first section is a letter which indicates which rank may use this command
-#   Valid ranks:
-#   n - Nobody (Completely disabled)
-#   a - Admins (Console)
-#   s - Senior Admins (Console)
-#   o - Ops (Non-Ops won't be able to use it)
-#
-# * The second section is a letter which indicates what to do when a player executes that command.
-#   Valid actions:
-#   b - Block the command
-#   a - Block the command and auto-eject that player (for ops and below)
-#   u - Block the command and Return an "Unknown command" message (Used to hide commands)
-#
-# * The third section is the command to be blocked, prefixed with a slash
-#
-# * The fourth section is the message to send to the player when executing that command.
-#   This should be omitted if unwanted. ChatColors are supported with the &-key. By default
-#   the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message
-#   by using a single underscore.
-#
-# Examples:
-#   - 'n:b:/mail sendall:&4You can't send mails to everyone!'
-#   - 's:a:/stop'
-#   - 'n:b:/ban:_'
-#
 blocked_commands:
-  # Core Protect Blocked and shows as an unknown command...
-  - 'a:u:/co:_'
-  - 'n:u:/co purge:_'
-  - 'a:u:/coreprotect:_'  
-  - 'n:u:/coreprotect purge:_'  
-  - 'a:u:/core:_' 
-  - 'n:u:/core purge:_' 
-  # Disabled commands
-  - 'n:b:/essentials:_'
-  - 'n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.'
-  - 'n:b:/disguiseradius:_'
-  - 'n:b:/undisguiseradius:_'
-  - 'n:b:/debug:_'
-  - 'n:b:/pardon:_'
-  - 'n:b:/ban-ip:_'
-  - 'n:b:/pardon-ip:_'
-  - 'n:b:/toggledownfall:_'
-  - 'n:b:/spreadplayers:_'
-  - 'n:b:/blockdata:_'
-  - 'n:b:/clearhistory:_'
-  - 'n:b:/save-on:_'
-  - 'n:b:/save-off:_'
-  - 'n:b:/packet:_'
-  - 'n:b://eval:_'
-  - 'n:b:/testvote:_'
-  - 'n:b:/nvreload:_'
-  - 'n:b:/bungeeguard:_'
-  - 'n:b:/buycraft:_'
-  - 'n:b:/spigot reload:_'
-#  - 'n:b:/setjail:_'
-  - 'n:b:/mail sendall:Sending mail to all players is not allowed.'
-  - 'n:b:/entitydata:_'
-  - 'n:b:/skins:_'
-  - 'n:b:/advancement:_'
-  - 'n:b:/worldborder:The worldborder does not need to be changed. This command is disabled.'
-  - 'n:b:/defaultgamemode:The default gamemode should not be changed.'
-  - 'n:b:/thread:_'
-  - 'n:b:/stacktrace:_'
-  - 'n:b:/function:_'
-  - 'n:b:/forceload:_'
-  - 'n:b:/fill:_'
-  - 'n:b:/paper:_'
-  - 'n:b:/locate:_'
-  - 'n:b:/vvbukkit:_'
-  - 'n:b:/plot area c:_'
-  - 'n:b:/d minecart_command:_'
-  - 'n:b:/loot:_'
-  - 'n:b:/plan:_'
-#  - 'n:b:/explosivearrows:&cDisabled until further notice'
-  - 'n:b://material:_'
-  - 'n:b://mat:_'
-  - 'n:b:/mat:_'
-  - 'n:b:/vpnguard:_'
-  - 'n:b:/pcapi:_'
-  - 'n:b://distr:&cNope.'
-  - 'n:b:/data:_'
-  - 'n:b:/datapack:_'
-  - 'n:b://regen:_'
-  - 'n:b:/onlinemode:&cThis breaks UUIDs.'
-  - 'n:b:/execute:_'
-  - 'n:b:/killall:_'
-  - 'n:b:/createdisguise:_'
-  - 'n:b:/attribute:_'
+  #
+  # How globally blocked commands work:
+  # All sections described below are delimited by colon characters.
+  # Make sure that you block a command by its main command name, not an alias
+  # as all aliases are blocked by default. Commands are case-insensitive.
+  #
+  # * The first section is a letter which indicates which rank may use this command
+  #   Valid ranks:
+  #   n - Nobody (Completely disabled)
+  #   a - Admins (Console)
+  #   s - Senior Admins (Console)
+  #   o - Ops (Non-Ops won't be able to use it)
+  #
+  # * The second section is a letter which indicates what to do when a player executes that command.
+  #   Valid actions:
+  #   b - Block the command
+  #   a - Block the command and auto-eject that player (for ops and below)
+  #   u - Block the command and Return an "Unknown command" message (Used to hide commands)
+  #
+  # * The third section is the command to be blocked, prefixed with a slash
+  #
+  # * The fourth section is the message to send to the player when executing that command.
+  #   This should be omitted if unwanted. ChatColors are supported with the &-key. By default
+  #   the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message
+  #   by using a single underscore.
+  #
+  # Examples:
+  #   - 'n:b:/mail sendall:&4You can't send mails to everyone!'
+  #   - 's:a:/stop'
+  #   - 'n:b:/ban:_'
+  #
+  global:
+    # CoreProtect Blocked and shows as an unknown command...
+    - 'a:u:/co:_'
+    - 'n:u:/co purge:_'
+    - 'a:u:/coreprotect:_'
+    - 'n:u:/coreprotect purge:_'
+    - 'a:u:/core:_'
+    - 'n:u:/core purge:_'
 
-  # Admin commands
-  - 'a:b:/vive:_'
-  - 'a:b:/vse:_'
-  - 'a:b:/lightning:_'
-  - 'a:b:/playsound:_'
-  - 'a:b:/locatebiome:_'
-  - 'a:b:/delchunks:_'
-  - 'a:b:/exploitfixer:_'
-  - 'a:b:/massivelag:_'
-  - 'a:b:/ml:_'
-  - 'a:b:/createkit:_'
-  - 'a:b:/delkit:_'
-  - 'a:b:/region:_'
-  - 'a:b:/clone:_'
-  - 'a:b:/cap:_'
-  - 'a:b:/gamemode:Use /gmc and /gms to set your gamemode.'
-  - 'a:b:/powernbt:_'
-  - 'a:b:/nbt.:_'
-  - 'a:b:/blockshub:_'
-  - 'a:b:/protocol:_'
-  - 'a:b:/libsdisguises reload:_'
-  - 'a:b://awe:_'
-  - 'a:b:/stopfire:_'
-  - 'a:b:/allowfire'
-  - 'a:b:/stoplag:_'
-  - 'a:b:/worldguard:_'
-  - 'a:b:/slay:_'
-  - 'a:b:/save-all:_'
-  - 'a:b:/libsdisguises:_'
-  - 'a:b:/particle:Due to security reasons, the use of /particle has been disabled.'
-  - 'a:b:/rainbowclear:_'
-  - 'a:b:/rainbowspeed:_'
-  - 'a:b:/kick:_'
-  - 'a:b:/difficulty:_'
-  - 'a:b:/captchafy:_'
-  - 'a:b:/socialspy:_'
-  - 'a:b:/sproxy:_'
-  - 'a:b:/replaceitem:_'
-  - 'a:b:/kill:_'
-  - 'a:b:/reaction:_'
-  - 'a:b:/setworldspawn:_'
-  - 'a:b:/scoreboard:_'
-  - 'a:b:/setspawn:_'
-  - 'a:b:/forestgen:_'
-  - 'a:b:/setidletimeout:_'
-  - 'a:b:/lrbuild:_'
-  - 'a:b:/size:_'
-  - 'a:b:/break:_'  
-  - 'a:b:/disentity:_'
-  - 'a:b:/reload:_'
-  - 'a:b:/title:_'
-  - 'a:b:/weather:_'
-  - 'a:b:/tpall:_'
-  - 'a:b:/etpall:_'
-  - 'a:b:/setblock:_'
-  - 'a:b:/gamerule:_'
-  - 'a:b:/togglejail:_'
-  - 'a:b:/range:_'
-  - 'a:b:/stop:_'
-  - 'a:b:/restart:_'
-  - 'a:b:/sr:_'
-  - 'a:b:/tpo:_'
-  - 'a:b:/tpohere:_'
-  - 'a:b:/tphere:_'
-  - 'a:b:/rfchairs:_'
-  - 'a:b:/ppo:_'
-  - 'a:b:/vulnerabilitypatcher:_'
-  - 'a:b:/crackshot config:_'
-  - 'a:b:/marry reload:_'
-  - 'a:b:/bh:_'
-  - 'a:b:/tpaall:_'
-  - 'a:b:/paper heap:_'
-  - 'a:u:/burn:_'
-  - 'a:b:/summon:_'
-  - 'a:b:/discord:_'
-  - 'a:b:/bossbar:_'
-  - 'a:b:/team:_'
-  - 'a:b:/spawner:_'
-#  - 'a:b:/getpos:_'
-  - 's:b:/istack:_'
-  - 'a:b:/getloc:_'
-  - 'a:b:/holo:_'
-  - 'a:b:/hd:_'
-  - 'a:b:/hologram:_'
-  - 'a:b:/holograms:_'
-#  - 'a:b:/whois:&cpeople like aurulim ruined the usage of this command, stop tp bypassing' # Blocking this is ridiculous. Instead of being lazy and just blocking whois, how about you disable the part where it reveals people's coords, like you did with disabling IPs?
-  - 's:b:/awe toggle:_'
-  - 's:b:/tellraw:_'
-  - 's:b://awe toggle:_'
-  - 'a:b:/openinv:_'
-  - 'a:b:/oi:_'
-  - 'a:b:/open:_'
-  - 'a:b:/openender:_'
-  - 'a:b:/oe:_'
-  - 'a:b:/searchinv:_'
-  - 'a:b:/si:_'
-  - 'a:b:/searchender:_'
-  - 'a:b:/se:_'
-  - 'a:b:/searchenchant:_'
-  - 'a:b:/searchenchants:_'
-  - 'a:b:/anycontainer:_'
-  - 'a:b:/anychest:_'
-  - 'a:b:/sc:_'
-  - 'a:b:/fawe:_'
-  - 'a:b:/wea:_'
-  - 'a:b:/protocolsupport:_'
-  - 'a:b:/ps:_'
-  - 'n:b:/wra:_'
-  - 's:b:/viaver:_'
-  - 's:b:/viaversion:_'
-  - 's:b:/spark:_'
+    # Disabled commands
+    - 'n:b:/essentials:_'
+    - 'n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.'
+    - 'n:b:/disguiseradius:_'
+    - 'n:b:/undisguiseradius:_'
+    - 'n:b:/debug:_'
+    - 'n:b:/pardon:_'
+    - 'n:b:/ban-ip:_'
+    - 'n:b:/pardon-ip:_'
+    - 'n:b:/toggledownfall:_'
+    - 'n:b:/spreadplayers:_'
+    - 'n:b:/blockdata:_'
+    - 'n:b:/clearhistory:_'
+    - 'n:b:/save-on:_'
+    - 'n:b:/save-off:_'
+    - 'n:b:/packet:_'
+    - 'n:b://eval:_'
+    - 'n:b:/testvote:_'
+    - 'n:b:/nvreload:_'
+    - 'n:b:/bungeeguard:_'
+    - 'n:b:/buycraft:_'
+    - 'n:b:/spigot reload:_'
+    - 'n:b:/mail sendall:Sending mail to all players is not allowed.'
+    - 'n:b:/entitydata:_'
+    - 'n:b:/skins:_'
+    - 'n:b:/advancement:_'
+    - 'n:b:/worldborder:The worldborder does not need to be changed. This command is disabled.'
+    - 'n:b:/defaultgamemode:The default gamemode should not be changed.'
+    - 'n:b:/thread:_'
+    - 'n:b:/stacktrace:_'
+    - 'n:b:/function:_'
+    - 'n:b:/forceload:_'
+    - 'n:b:/fill:_'
+    - 'n:b:/paper:_'
+    - 'n:b:/locate:_'
+    - 'n:b:/vvbukkit:_'
+    - 'n:b:/plot area c:_'
+    - 'n:b:/d minecart_command:_'
+    - 'n:b:/loot:_'
+    - 'n:b:/plan:_'
+    - 'n:b://material:_'
+    - 'n:b://mat:_'
+    - 'n:b:/mat:_'
+    - 'n:b:/vpnguard:_'
+    - 'n:b:/pcapi:_'
+    - 'n:b://distr:&cNope.'
+    - 'n:b:/data:_'
+    - 'n:b:/datapack:_'
+    - 'n:b://regen:_'
+    - 'n:b:/execute:_'
+    - 'n:b:/killall:_'
+    - 'n:b:/createdisguise:_'
+    - 'n:b:/attribute:_'
+
+    # Admin commands
+    - 'a:b:/vive:_'
+    - 'a:b:/vse:_'
+    - 'a:b:/lightning:_'
+    - 'a:b:/playsound:_'
+    - 'a:b:/locatebiome:_'
+    - 'a:b:/delchunks:_'
+    - 'a:b:/exploitfixer:_'
+    - 'a:b:/massivelag:_'
+    - 'a:b:/ml:_'
+    - 'a:b:/createkit:_'
+    - 'a:b:/delkit:_'
+    - 'a:b:/region:_'
+    - 'a:b:/clone:_'
+    - 'a:b:/cap:_'
+    - 'a:b:/gamemode:Use /gmc and /gms to set your gamemode.'
+    - 'a:b:/powernbt:_'
+    - 'a:b:/nbt.:_'
+    - 'a:b:/blockshub:_'
+    - 'a:b:/protocol:_'
+    - 'a:b:/libsdisguises reload:_'
+    - 'a:b://awe:_'
+    - 'a:b:/stopfire:_'
+    - 'a:b:/allowfire'
+    - 'a:b:/stoplag:_'
+    - 'a:b:/worldguard:_'
+    - 'a:b:/slay:_'
+    - 'a:b:/save-all:_'
+    - 'a:b:/libsdisguises:_'
+    - 'a:b:/particle:Due to security reasons, the use of /particle has been disabled.'
+    - 'a:b:/rainbowclear:_'
+    - 'a:b:/rainbowspeed:_'
+    - 'a:b:/kick:_'
+    - 'a:b:/difficulty:_'
+    - 'a:b:/captchafy:_'
+    - 'a:b:/socialspy:_'
+    - 'a:b:/sproxy:_'
+    - 'a:b:/replaceitem:_'
+    - 'a:b:/kill:_'
+    - 'a:b:/reaction:_'
+    - 'a:b:/setworldspawn:_'
+    - 'a:b:/scoreboard:_'
+    - 'a:b:/setspawn:_'
+    - 'a:b:/forestgen:_'
+    - 'a:b:/setidletimeout:_'
+    - 'a:b:/lrbuild:_'
+    - 'a:b:/size:_'
+    - 'a:b:/break:_'
+    - 'a:b:/disentity:_'
+    - 'a:b:/reload:_'
+    - 'a:b:/title:_'
+    - 'a:b:/weather:_'
+    - 'a:b:/tpall:_'
+    - 'a:b:/etpall:_'
+    - 'a:b:/setblock:_'
+    - 'a:b:/gamerule:_'
+    - 'a:b:/togglejail:_'
+    - 'a:b:/range:_'
+    - 'a:b:/stop:_'
+    - 'a:b:/restart:_'
+    - 'a:b:/sr:_'
+    - 'a:b:/tpo:_'
+    - 'a:b:/tpohere:_'
+    - 'a:b:/tphere:_'
+    - 'a:b:/rfchairs:_'
+    - 'a:b:/ppo:_'
+    - 'a:b:/vulnerabilitypatcher:_'
+    - 'a:b:/crackshot config:_'
+    - 'a:b:/marry reload:_'
+    - 'a:b:/bh:_'
+    - 'a:b:/tpaall:_'
+    - 'a:b:/paper heap:_'
+    - 'a:u:/burn:_'
+    - 'a:b:/summon:_'
+    - 'a:b:/discord:_'
+    - 'a:b:/bossbar:_'
+    - 'a:b:/team:_'
+    - 'a:b:/spawner:_'
+    - 's:b:/istack:_'
+    - 'a:b:/getloc:_'
+    - 'a:b:/holo:_'
+    - 'a:b:/hd:_'
+    - 'a:b:/hologram:_'
+    - 'a:b:/holograms:_'
+    - 's:b:/awe toggle:_'
+    - 's:b:/tellraw:_'
+    - 's:b://awe toggle:_'
+    - 'a:b:/openinv:_'
+    - 'a:b:/oi:_'
+    - 'a:b:/open:_'
+    - 'a:b:/openender:_'
+    - 'a:b:/oe:_'
+    - 'a:b:/searchinv:_'
+    - 'a:b:/si:_'
+    - 'a:b:/searchender:_'
+    - 'a:b:/se:_'
+    - 'a:b:/searchenchant:_'
+    - 'a:b:/searchenchants:_'
+    - 'a:b:/anycontainer:_'
+    - 'a:b:/anychest:_'
+    - 'a:b:/sc:_'
+    - 'a:b:/fawe:_'
+    - 'a:b:/wea:_'
+    - 'a:b:/protocolsupport:_'
+    - 'a:b:/ps:_'
+    - 'n:b:/wra:_'
+    - 's:b:/viaver:_'
+    - 's:b:/viaversion:_'
+    - 's:b:/spark:_'
+    - 's:b://g:_'
+
+  # Commands that cannot be used by muted players
+  muted:
+    - say
+    - me
+    - msg
+    - tell
+    - reply
+    - mail
+
+  # Commands that cannot be used with /wildcard
+  wildcard:
+    - wildcard
+    - gtfo
+    - doom
+    - slconfig
+    - smite
+
+# Words that cannot be used in tags
+forbidden_words:
+  - admin
+  - owner
+  - moderator
+  - developer
+  - console
+  - dev
+  - staff
+  - mod
+  - sra
+  - tca
+  - sta
+  - sa
 
 # Automatically wipe dropped objects
 auto_wipe: true
@@ -536,7 +568,7 @@ admininfo:
   - ' &6- Report those breaking the rules'
   - ' &2- And apply on our forums at the link:'
   - '&9https://forum.totalfreedom.me/d/45-admin-application-template'
-  
+
 # What to display in the vote command.
 votinginfo:
   - '&bVoting Links:'
@@ -737,3 +769,6 @@ blocked_chatcodes: '&0,&k,&m,&n'
 
 # Enables certain things like debug logs and console bypasses
 developer_mode: false
+
+# AntiSpam Time (minutes)
+antispam_minutes: 2

supressions.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
         "-//Puppy Crawl//DTD Suppressions 1.1//EN"
         "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
 <suppressions>
     <suppress files="Metrics\.java" checks="[a-zA-Z0-9]*"/>
     <suppress files="NanoHTTPD\.java" checks="[a-zA-Z0-9]*"/>
     <suppress files="CleanroomChunkGenerator\.java" checks="[a-zA-Z0-9]*"/>
-</suppressions>
+</suppressions>