fix requested by packs

apparently some pterodactyl installations don't like short UUIDs so this changes the config to say "use long uuids, not short uuids" instead

.github/workflows/downstream.yml

@@ -0,0 +1,43 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Downstream Branch Updates
+
+on:
+  schedule:
+    - cron:  '20 7 * * *'
+    # scheduled at 07:00 every Monday and Thursday
+
+  workflow_dispatch:  # click the button on Github repo!
+
+
+jobs:
+  sync_with_upstream:
+    runs-on: ubuntu-latest
+    name: Sync main with upstream latest
+
+    steps:
+    # Step 1: run a standard checkout action, provided by github
+    - name: Checkout main
+      uses: actions/checkout@v2
+      with:
+        ref: main
+        # submodules: 'recursive'     ### may be needed in your situation
+
+    # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
+    - name: Pull (Fast-Forward) upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v2.1
+      with:
+        upstream_repository: AtlasMediaGroup/TotalFreedomMod
+        upstream_branch: main
+        target_branch: main
+        git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
+
+    # Step 3: Display a message if 'sync' step had new commits (simple test)
+    - name: Check for new commits
+      if: steps.sync.outputs.has_new_commits
+      run: echo "There were new commits."
+
+    # Step 4: Print a helpful timestamp for your records (not required, just nice)
+    - name: Timestamp
+      run: date

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).

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,8 +32,9 @@ 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.
 
@@ -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

@@ -2,16 +2,34 @@
 
 ## Supported Versions
 
-We currently support the code running on the "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
+We currently support the code running on the "main" branch and "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
 
-In terms of plugin releases, we support the following versions:
+In terms of plugin releases, our support matrix is as follows:
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 2020.11   | :white_check_mark: |
-| 6.0.x (Pre-Release)  | :x:                |
-| < 2020.11  | :x:                |
-| < 5.x  | :x:                |
+### Actively Supported
+These versions are currently actively supported by our team, and you should expect security patches where appropriate for these versions. 
+
+| Version             | Supported          | Support End:                   |
+| ------------------- | ------------------ | ------------------------------ |
+| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
+
+### Legacy Supported
+These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
+
+| Version             | Supported          | Support End: |
+| ------------------- | ------------------ | ------------ |
+| 2021.04             | :white_check_mark: | July 2021    |
+
+### No Longer Supported
+These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
+
+| Version             | Supported          | Support Ended:      |
+| ------------------- | ------------------ | ------------------- |
+| 2021.02             | :x:                | 6 June 2021         |
+| 2020.11             | :x:                | 3 May 2021          |
+| 6.0.x (Pre-Release) | :x:                | December 2020       |
+| < 2020.11           | :x:                | December 2020       |
+| < 5.x               | :x:                | December 2020       |
 
 ## Reporting a Vulnerability
 

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"/>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.02-RC03</version>
+    <version>2021.05</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -39,6 +39,11 @@
     </scm>
 
     <repositories>
+        <repository>
+            <id>apache-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots/</url>
+        </repository>
+
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -75,9 +80,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>
@@ -106,13 +111,13 @@
         </repository>
 
         <repository>
-            <id>rayzr-repo</id>
-            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
+            <id>ess-repo</id>
+            <url>https://ci.ender.zone/plugin/repository/everything/</url>
         </repository>
 
         <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
+            <id>mattmalec-repo</id>
+            <url>https://repo.mattmalec.com/repository/releases</url>
         </repository>
     </repositories>
 
@@ -149,7 +154,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>2.2.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -191,21 +196,21 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_224</version>
+            <version>4.3.0_277</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.3</version>
+            <version>19.5</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4</version>
+            <version>7.0.5</version>
             <scope>provided</scope>
         </dependency>
 
@@ -216,13 +221,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>me.rayzr522</groupId>
-            <artifactId>jsonmessage</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.github.vexsoftware</groupId>
             <artifactId>votifier</artifactId>
@@ -252,9 +250,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>
 
@@ -271,12 +269,31 @@
             <version>3.1.1</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.mattmalec</groupId>
+            <artifactId>Pterodactyl4J</artifactId>
+            <version>2.BETA_47</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
             <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>
@@ -306,7 +323,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.2</version>
+                <version>4.0.5</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -419,10 +436,12 @@
             </plugin>
 
             <!-- Shade -->
+            <!-- NOTE: This should only be temporary. This will need to be updated when a stable build comes out
+            that supports Java 16 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -434,7 +453,7 @@
                             <relocations>
                                 <relocation>
                                     <pattern>io.papermc.lib</pattern>
-                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern> <!-- Replace this -->
+                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -448,11 +467,11 @@
                                     <include>commons-codec:commons-codec</include>
                                     <include>org.reflections:reflections</include>
                                     <include>org.javassist:javassist</include>
-                                    <include>me.rayzr522:jsonmessage</include>
                                     <include>io.papermc:paperlib</include>
                                     <include>com.github.speedxx:Mojangson</include>
                                     <include>org.bstats:bstats-bukkit</include>
                                     <include>org.jetbrains:annotations</include>
+                                    <include>com.mattmalec:Pterodactyl4J</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

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,24 +68,27 @@ 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);
+
+            int time = count * minutes;
+            playerdata.setMuted(true, time);
+
+            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)
         {
             FUtil.playerMsg(player, "Please refrain from spamming chat.", ChatColor.GRAY);
@@ -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/AutoEject.java

@@ -85,6 +85,10 @@ public class AutoEject extends FreedomService
                 player.kickPlayer(kickMessage);
                 break;
             }
+            default:
+            {
+                FLog.warning("Unrecognized EjectMethod " + method.name() + " found, defaulting to STRIKE_THREE");
+            }
             case STRIKE_THREE:
             {
                 plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage));

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,13 +159,10 @@ 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())
-        {
-            if (plugin.al.isAdmin(player))
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
         {
             Admin admin = plugin.al.getAdmin(player);
-                if (!Strings.isNullOrEmpty(admin.getAcFormat()))
-                {
+            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);
@@ -175,8 +172,7 @@ public class ChatManager extends FreedomService
             {
                 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/CommandSpy.java

@@ -25,11 +25,6 @@ public class CommandSpy extends FreedomService
         {
             if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy())
             {
-                if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player))
-                {
-                    continue;
-                }
-
                 if (player != event.getPlayer())
                 {
                     FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());

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

@@ -2,6 +2,8 @@ package me.totalfreedom.totalfreedommod;
 
 import java.util.Arrays;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -32,9 +34,12 @@ public class EntityWiper extends FreedomService
         {
             @Override
             public void run()
+            {
+                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
                 {
                     wipeEntities(false);
                 }
+            }
         }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }
 

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

@@ -4,7 +4,6 @@ import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
-import me.rayzr522.jsonmessage.JSONMessage;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -240,17 +239,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/Pterodactyl.java

@@ -1,26 +1,30 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
+import com.mattmalec.pterodactyl4j.Permission;
+import com.mattmalec.pterodactyl4j.PowerAction;
+import com.mattmalec.pterodactyl4j.PteroAction;
+import com.mattmalec.pterodactyl4j.PteroBuilder;
+import com.mattmalec.pterodactyl4j.application.entities.ApplicationUser;
+import com.mattmalec.pterodactyl4j.application.entities.PteroApplication;
+import com.mattmalec.pterodactyl4j.application.managers.UserAction;
+import com.mattmalec.pterodactyl4j.client.entities.ClientServer;
+import com.mattmalec.pterodactyl4j.client.entities.ClientSubuser;
+import com.mattmalec.pterodactyl4j.client.entities.PteroClient;
 import joptsimple.internal.Strings;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import me.totalfreedom.totalfreedommod.util.Response;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.ParseException;
 
 public class Pterodactyl extends FreedomService
 {
-
     public final String URL = ConfigEntry.PTERO_URL.getString();
-    private final String SERVER_KEY = ConfigEntry.PTERO_SERVER_KEY.getString();
     private final String ADMIN_KEY = ConfigEntry.PTERO_ADMIN_KEY.getString();
-    private final List<String> SERVER_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + SERVER_KEY);
-    private final List<String> ADMIN_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + ADMIN_KEY);
+    private final String CLIENT_KEY = ConfigEntry.PTERO_CLIENT_KEY.getString();
+    private final String IDENTIFIER = ConfigEntry.PTERO_SERVER_UUID.getString();
+    private final PteroApplication adminAPI = PteroBuilder.createApplication(URL, ADMIN_KEY);
+    private final PteroClient clientAPI = PteroBuilder.createClient(URL, CLIENT_KEY);
+    private final ClientServer server = clientAPI.retrieveServerByIdentifier(IDENTIFIER).execute();
 
     private boolean enabled = !Strings.isNullOrEmpty(URL);
 
@@ -43,163 +47,60 @@ public class Pterodactyl extends FreedomService
 
         if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN)
         {
-            FLog.debug("Disabling ptero acc");
+            FLog.debug("Disabling Pterodactyl account");
             removeAccountFromServer(id);
             return;
         }
 
-        FLog.debug("Enabling ptero acc");
+        FLog.debug("Enabling Pterodactyl account");
         addAccountToServer(id);
     }
 
-    @SuppressWarnings("unchecked")
     public String createAccount(String username, String password)
     {
-        JSONObject json = new JSONObject();
-        json.put("username", username);
-        json.put("password", password);
-        json.put("email", username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString());
-        json.put("first_name", username);
-        json.put("last_name", "\u200E"); // required, so I made it appear empty
+        UserAction action = adminAPI.getUserManager().createUser()
+                .setUserName(username)
+                .setEmail(username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString())
+                .setFirstName(username)
+                .setLastName("\u200E") // Required - make it appear empty
+                .setPassword(password);
 
-        Response response;
-        JSONObject jsonResponse;
-        try
-        {
-            response = FUtil.sendRequest(URL + "/api/application/users", "POST", ADMIN_HEADERS, json.toJSONString());
-            jsonResponse = response.getJSONMessage();
-        }
-        catch (IOException | ParseException e)
-        {
-            FLog.severe(e);
-            return null;
+        return action.execute().getId();
     }
 
-        return ((JSONObject)jsonResponse.get("attributes")).get("id").toString();
-
+    public void deleteAccount(String id)
+    {
+        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
+        PteroAction<Void> action = adminAPI.getUserManager().deleteUser(username);
+        action.execute();
     }
 
-    public boolean deleteAccount(String id)
-    {
-        JSONObject json = new JSONObject();
-        try
-        {
-            return FUtil.sendRequest(URL + "/api/application/users/" + id, "DELETE", ADMIN_HEADERS, json.toJSONString()).getCode() == 204;
-        }
-        catch (IOException e)
-        {
-            FLog.severe(e);
-            return false;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
     public void addAccountToServer(String id)
     {
-        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users";
-
-        JSONObject userData = getUserData(id);
-        if (userData == null)
-        {
-            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
-            return;
-        }
-
-        JSONObject json = new JSONObject();
-        json.put("email", userData.get("email").toString());
-        json.put("permissions", Arrays.asList("control.console", "control.start", "control.restart", "control.stop", "control.kill"));
-
-        try
-        {
-            FUtil.sendRequest(url, "POST", SERVER_HEADERS, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            FLog.severe(e);
-        }
+        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
+        String email = username.getEmail();
+        PteroAction<ClientServer> server = clientAPI.retrieveServerByIdentifier(IDENTIFIER);
+        server.execute().getSubuserManager().createUser()
+                .setEmail(email)
+                .setPermissions(Permission.CONTROL_PERMISSIONS).execute();
     }
 
     public void removeAccountFromServer(String id)
     {
-        JSONObject userData = getUserData(id);
-        if (userData == null)
-        {
-            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
-            return;
+        ApplicationUser username = adminAPI.retrieveUserById(id).execute();
+        PteroAction<ClientServer> server = clientAPI.retrieveServerByIdentifier(IDENTIFIER);
+        ClientSubuser clientSubuser = server.execute().getSubuser(username.getUUID()).retrieve().execute();
+        server.execute().getSubuserManager().deleteUser(clientSubuser).execute();
     }
 
-        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users/" + userData.get("uuid");
-
-        try
+    public void stopServer()
     {
-            FUtil.sendRequest(url, "DELETE", SERVER_HEADERS, null);
-        }
-        catch (IOException e)
-        {
-            FLog.severe(e);
-        }
+        clientAPI.setPower(server, PowerAction.STOP).execute();
     }
 
-    public JSONObject getUserData(String id)
+    public void restartServer()
     {
-        Response response;
-        JSONObject jsonResponse;
-        try
-        {
-            response = FUtil.sendRequest(URL + "/api/application/users/" + id, "GET", ADMIN_HEADERS, null);
-            jsonResponse = response.getJSONMessage();
-
-        }
-        catch (IOException | ParseException e)
-        {
-            FLog.severe(e);
-            return null;
-        }
-
-        return (JSONObject)jsonResponse.get("attributes");
-
-    }
-
-    // API patch function on users doesnt work rn, it throws 500 errors, so it's probably not written yet
-    @SuppressWarnings("unchecked")
-    public void setPassword(String id, String password)
-    {
-        JSONObject json = new JSONObject();
-        json.put("password", password);
-
-        try
-        {
-            FUtil.sendRequest(URL + "/api/application/users/" + id, "PATCH", ADMIN_HEADERS, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            FLog.severe(e);
-        }
-    }
-
-    public String getURL()
-    {
-        return URL;
-    }
-
-    public String getServerKey()
-    {
-        return SERVER_KEY;
-    }
-
-    public String getAdminKey()
-    {
-        return ADMIN_KEY;
-    }
-
-    public List<String> getServerHeaders()
-    {
-        return SERVER_HEADERS;
-    }
-
-    public List<String> getAdminHeaders()
-    {
-        return ADMIN_HEADERS;
+        clientAPI.setPower(server, PowerAction.RESTART).execute();
     }
 
     public boolean isEnabled()

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/banning/IndefiniteBan.java

@@ -43,6 +43,7 @@ public class IndefiniteBan implements IConfig
     @Override
     public void saveTo(ConfigurationSection cs)
     {
+        // The indefinite ban list is only intended to be modified manually. It is not intended to save.
     }
 
     @Override

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

@@ -171,6 +171,11 @@ public class BlockBlocker extends FreedomService
                 }
                 break;
             }
+            default:
+            {
+                // Do nothing
+                break;
+            }
         }
 
         if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))

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/blocking/InteractBlocker.java

@@ -36,10 +36,9 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case LEFT_CLICK_AIR:
-            case LEFT_CLICK_BLOCK:
+            default:
             {
-                //
+                // Do nothing
                 break;
             }
         }
@@ -158,6 +157,11 @@ public class InteractBlocker extends FreedomService
                 event.setCancelled(true);
                 break;
             }
+            default:
+            {
+                // Do nothing
+                break;
+            }
         }
     }
 }

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_blockcmd.java

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -75,9 +77,11 @@ public class Command_blockcmd extends FreedomCommand
         FPlayer playerdata = plugin.pl.getPlayer(player);
         if (!playerdata.allCommandsBlocked())
         {
-            playerdata.setCommandsBlocked(true);
             FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
+            playerdata.setCommandsBlocked(true);
             msg("Blocked commands for " + player.getName() + ".");
+
+            plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.BLOCKCMD, null));
         }
         else
         {

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

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.ArrayUtils;
@@ -92,7 +94,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;
         }
 
@@ -128,6 +130,8 @@ public class Command_blockedit extends FreedomCommand
 
             msg(player2, "Your block modification abilities have been blocked.", ChatColor.RED);
             msg("Blocked all block modification abilities for " + player2.getName());
+
+            plugin.pul.logPunishment(new Punishment(player2.getName(), FUtil.getIp(player2), sender.getName(), PunishmentType.BLOCKEDIT, null));
         }
         return true;
     }

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

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang3.ArrayUtils;
@@ -93,7 +95,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;
         }
 
@@ -125,6 +127,7 @@ public class Command_blockpvp extends FreedomCommand
             {
                 Command_smite.smite(sender, p, reason);
             }
+            plugin.pul.logPunishment(new Punishment(p.getName(), FUtil.getIp(p), sender.getName(), PunishmentType.BLOCKPVP, null));
 
             msg(p, "Your PVP has been disabled.", ChatColor.RED);
             msg("Disabled PVP for " + p.getName());

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

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -42,14 +44,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,11 +82,24 @@ public class Command_cage extends FreedomCommand
                         outerMaterial = Material.matchMaterial(args[2]);
                         break;
                     }
-                    sender.sendMessage(ChatColor.RED + "Invalid block!");
+                    msg("Invalid block!", ChatColor.RED);
                     break;
                 }
+                default:
+                {
+                    return false;
                 }
             }
+        }
+
+        if (outerMaterial == Material.PLAYER_HEAD)
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+        }
+        else
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+        }
 
         Location location = player.getLocation().clone().add(0.0, 1.0, 0.0);
 
@@ -96,17 +111,9 @@ public class Command_cage extends FreedomCommand
         {
             fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
         }
-
         player.setGameMode(GameMode.SURVIVAL);
 
-        if (outerMaterial == Material.PLAYER_HEAD)
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
-        }
-        else
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
-        }
+        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.CAGE, null));
         return true;
     }
 

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_entitywipe.java

@@ -64,6 +64,12 @@ public class Command_entitywipe extends FreedomCommand
                     return true;
                 }
 
+                if (type == EntityType.PLAYER)
+                {
+                    msg("Player entities cannot be purged.", ChatColor.RED);
+                    return true;
+                }
+
                 if (!getAllEntities().contains(type))
                 {
                     msg(FUtil.formatName(type.name()) + " is an entity, however: it is a mob.", ChatColor.RED);

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

@@ -23,12 +23,12 @@ public class Command_freeze extends FreedomCommand
 
             if (!gFreeze)
             {
-                FUtil.adminAction(sender.getName(), "Disabling global player freeze", false);
+                FUtil.adminAction(sender.getName(), "Unfreezing all players", false);
                 msg("Players are now free to move.");
                 return true;
             }
 
-            FUtil.adminAction(sender.getName(), "Enabling global player freeze", false);
+            FUtil.adminAction(sender.getName(), "Freezing all players", false);
             for (Player player : server.getOnlinePlayers())
             {
                 if (!isAdmin(player))

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)
@@ -28,9 +30,12 @@ public class Command_list extends FreedomCommand
         {
             List<String> names = new ArrayList<>();
             for (Player player : server.getOnlinePlayers())
+            {
+                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

@@ -35,8 +35,8 @@ public class Command_manageshop extends FreedomCommand
             }
             switch (args[1])
             {
-
                 case "add":
+                {
                     try
                     {
                         int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
@@ -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);
                         }
@@ -75,7 +75,9 @@ public class Command_manageshop extends FreedomCommand
                         msg("Invalid number: " + args[2], ChatColor.RED);
                         return true;
                     }
+                }
                 case "remove":
+                {
                     try
                     {
                         int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
@@ -97,7 +99,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 +113,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);
                         }
@@ -122,7 +124,9 @@ public class Command_manageshop extends FreedomCommand
                         msg("Invalid number: " + args[2], ChatColor.RED);
                         return true;
                     }
+                }
                 case "set":
+                {
                     try
                     {
                         int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
@@ -138,7 +142,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;
                     }
@@ -148,6 +152,11 @@ public class Command_manageshop extends FreedomCommand
                         return true;
                     }
                 }
+                default:
+                {
+                    return false;
+                }
+            }
         }
         else if (args[0].equals("items"))
         {
@@ -183,7 +192,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 +217,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_notes.java

@@ -116,9 +116,13 @@ public class Command_notes extends FreedomCommand
                 msg("Cleared " + count + " notes.", ChatColor.GREEN);
                 return true;
             }
-        }
+
+            default:
+            {
                 return false;
             }
+        }
+    }
 
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)

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_orbit.java

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -56,11 +58,13 @@ public class Command_orbit extends FreedomCommand
             }
         }
 
+        FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
+
         player.setGameMode(GameMode.SURVIVAL);
         playerdata.startOrbiting(strength);
-
         player.setVelocity(new Vector(0, strength, 0));
-        FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
+
+        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.ORBIT, null));
         return true;
     }
 }

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

@@ -17,11 +17,9 @@ import org.bukkit.entity.Player;
 @CommandParameters(description = "Manage your Pterodactyl panel account", usage = "/<command> <create | delete>")
 public class Command_panel extends FreedomCommand
 {
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-
         if (!plugin.ptero.isEnabled())
         {
             msg("Pterodactyl integration is currently disabled.", ChatColor.RED);
@@ -32,7 +30,7 @@ public class Command_panel extends FreedomCommand
 
         if (playerData.getDiscordID() == null)
         {
-            msg("You must have a linked discord account.", ChatColor.RED);
+            msg("You must have a linked Discord account.", ChatColor.RED);
             return true;
         }
 
@@ -63,13 +61,11 @@ public class Command_panel extends FreedomCommand
             }
 
             plugin.ptero.addAccountToServer(id);
-
             admin.setPteroID(id);
             plugin.al.save(admin);
             plugin.al.updateTables();
-
             plugin.dc.sendPteroInfo(playerData, username, password);
-            msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN);
+            msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.dc.formatBotTag() + " on Discord to get your credentials.", ChatColor.GREEN);
             return true;
         }
         else if (args[0].equalsIgnoreCase("delete"))
@@ -83,18 +79,10 @@ public class Command_panel extends FreedomCommand
                 return true;
             }
 
-            boolean deleted = plugin.ptero.deleteAccount(admin.getPteroID());
-
-            if (!deleted)
-            {
-                msg("Failed to delete your Pterodactyl account.", ChatColor.RED);
-                return true;
-            }
-
+            plugin.ptero.deleteAccount(admin.getPteroID());
             admin.setPteroID(null);
             plugin.al.save(admin);
             plugin.al.updateTables();
-
             msg("Successfully deleted your Pterodactyl account.", ChatColor.GREEN);
             return true;
         }

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

@@ -29,6 +29,7 @@ public class Command_potion extends FreedomCommand
         switch (args.length)
         {
             case 1:
+            {
                 if (args[0].equalsIgnoreCase("list"))
                 {
                     List<String> potionEffectTypeNames = new ArrayList<>();
@@ -58,14 +59,16 @@ public class Command_potion extends FreedomCommand
                         }
                     }
                 }
+            }
 
             case 2:
+            {
                 if (args[0].equalsIgnoreCase("clear"))
                 {
                     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;
@@ -95,18 +98,20 @@ public class Command_potion extends FreedomCommand
                     msg("Cleared all active potion effects " + (!target.equals(playerSender) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
                 }
                 break;
+            }
 
             case 4:
             case 5:
+            {
                 if (args[0].equalsIgnoreCase("add"))
                 {
                     Player target = playerSender;
 
                     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 +119,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 +127,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 +135,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;
                     }
 
@@ -167,9 +172,12 @@ public class Command_potion extends FreedomCommand
                                     + (!target.equals(playerSender) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA);
                 }
                 break;
+            }
             default:
+            {
                 return false;
             }
+        }
         return true;
     }
 
@@ -179,14 +187,17 @@ public class Command_potion extends FreedomCommand
         switch (args.length)
         {
             case 1:
+            {
                 List<String> arguments = new ArrayList<>(Arrays.asList("list", "clear", "add"));
                 if (plugin.al.isAdmin(sender))
                 {
                     arguments.add("clearall");
                 }
                 return arguments;
+            }
 
             case 2:
+            {
                 if (args[0].equals("clear"))
                 {
                     if (plugin.al.isAdmin(sender))
@@ -199,22 +210,28 @@ public class Command_potion extends FreedomCommand
                     return getAllPotionTypes();
                 }
                 break;
+            }
 
             case 3:
+            {
                 if (args[0].equals("add"))
                 {
                     return Collections.singletonList("<duration>");
                 }
                 break;
+            }
 
             case 4:
+            {
                 if (args[0].equals("add"))
                 {
                     return Collections.singletonList("<amplifier>");
                 }
                 break;
+            }
 
             case 5:
+            {
                 if (plugin.al.isAdmin(sender))
                 {
                     if (args[0].equals("add"))
@@ -225,6 +242,12 @@ public class Command_potion extends FreedomCommand
                 break;
             }
 
+            default:
+            {
+                break;
+            }
+        }
+
         return Collections.emptyList();
     }
 

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_restart.java

@@ -0,0 +1,77 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.HashMap;
+import java.util.Map;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.StringUtils;
+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.ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Restart the server", usage = "/<command> [reason]")
+public class Command_restart extends FreedomCommand
+{
+    private static final Map<CommandSender, String> RESTART_CONFIRM = new HashMap<>();
+
+    @Override
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
+    {
+        if (!plugin.ptero.isEnabled())
+        {
+            msg("Pterodactyl integration is currently disabled.", ChatColor.RED);
+            return true;
+        }
+
+        String reason = "Server is restarting!";
+
+        if (args.length != 0)
+        {
+            reason = StringUtils.join(args, " ");
+        }
+
+        if (sender.getName().equals("CONSOLE"))
+        {
+            restart(reason);
+            return true;
+        }
+        else if (RESTART_CONFIRM.containsKey(sender))
+        {
+            restart(RESTART_CONFIRM.get(sender));
+            return true;
+        }
+
+        msg("Warning: You're about to restart the server. Type /restart again to confirm you want to do this.");
+
+        RESTART_CONFIRM.put(sender, reason);
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                if (RESTART_CONFIRM.containsKey(sender))
+                {
+                    RESTART_CONFIRM.remove(sender);
+                    msg("Restart request expired.");
+                }
+            }
+        }.runTaskLater(plugin, 15 * 20);
+        return true;
+    }
+
+    public void restart(String reason)
+    {
+        FUtil.bcastMsg("Server is restarting!", ChatColor.LIGHT_PURPLE);
+
+        for (Player player : server.getOnlinePlayers())
+        {
+            player.kickPlayer(ChatColor.LIGHT_PURPLE + reason);
+        }
+
+        RESTART_CONFIRM.remove(sender);
+        plugin.ptero.restartServer();
+    }
+}

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
+        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,11 +128,11 @@ 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));
 

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_stop.java

@@ -20,7 +20,6 @@ public class Command_stop extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-
         String reason = "Server is going offline, come back in about 20 seconds.";
 
         if (args.length != 0)
@@ -39,7 +38,6 @@ public class Command_stop extends FreedomCommand
             return true;
         }
 
-
         msg("Warning: You're about to stop the server. Type /stop again to confirm you want to do this.");
 
         STOP_CONFIRM.put(sender, reason);
@@ -69,6 +67,13 @@ public class Command_stop extends FreedomCommand
 
         STOP_CONFIRM.remove(sender);
 
+        if (plugin.ptero.isEnabled())
+        {
+            plugin.ptero.stopServer();
+        }
+        else
+        {
             server.shutdown();
         }
+    }
 }

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)
     {
@@ -107,6 +105,11 @@ public class Command_tag extends FreedomCommand
                     }
                     return true;
                 }
+
+                default:
+                {
+                    return false;
+                }
             }
         }
         else if (args.length >= 2)
@@ -170,7 +173,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 +264,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))
                             {
@@ -281,6 +284,11 @@ public class Command_tag extends FreedomCommand
                     msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : "") + from + to);
                     return true;
                 }
+
+                default:
+                {
+                    return false;
+                }
             }
         }
         return false;

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,7 +88,26 @@ 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)
+        {
+            if (player != null)
             {
                 // Strike with lightning
                 final Location targetPos = player.getLocation();
@@ -92,26 +119,28 @@ public class Command_tempban extends FreedomCommand
                         Objects.requireNonNull(targetPos.getWorld()).strikeLightningEffect(strike_pos);
                     }
                 }
+            }
 
             FUtil.adminAction(sender.getName(), message.toString(), true);
         }
         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);
-        }
-        plugin.bm.addBan(ban);
             player.kickPlayer(ban.bakeKickMessage());
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.TEMPBAN, reason));
+            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.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

@@ -16,6 +16,12 @@ import org.bukkit.entity.Player;
 @CommandParameters(description = "Toggles TotalFreedomMod settings", usage = "/<command> [option] [value] [value]")
 public class Command_toggle extends FreedomCommand
 {
+    private final List<String> toggles = Arrays.asList(
+            "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
+            "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke [range] [count]",
+            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "structureblocks", "jigsaws", "grindstones",
+            "jukeboxes", "spawners", "4chan", "beehives", "respawnanchors", "autotp", "autoclear", "minecarts", "mp44",
+            "landmines", "tossmob", "gravity");
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@@ -23,37 +29,10 @@ public class Command_toggle extends FreedomCommand
         if (args.length == 0)
         {
             msg("Available toggles: ");
-            msg("- waterplace");
-            msg("- fireplace");
-            msg("- lavaplace");
-            msg("- fluidspread");
-            msg("- lavadmg");
-            msg("- firespread");
-            msg("- frostwalk");
-            msg("- firework");
-            msg("- prelog");
-            msg("- lockdown");
-            msg("- petprotect");
-            msg("- entitywipe");
-            msg("- nonuke [range] [count]");
-            msg("- explosives [radius]");
-            msg("- unsafeenchs");
-            msg("- bells");
-            msg("- armorstands");
-            msg("- structureblocks");
-            msg("- jigsaws");
-            msg("- grindstones");
-            msg("- jukeboxes");
-            msg("- spawners");
-            msg("- 4chan");
-            msg("- beehives");
-            msg("- respawnanchors");
-            msg("- autotp");
-            msg("- autoclear");
-            msg("- minecarts");
-            msg("- landmines");
-            msg("- mp44");
-            msg("- tossmob");
+            for (String toggle : toggles)
+            {
+                msg("- " + toggle);
+            }
             return false;
         }
 
@@ -297,6 +276,22 @@ public class Command_toggle extends FreedomCommand
                 toggle("Tossmob is", ConfigEntry.TOSSMOB_ENABLED);
                 break;
             }
+
+            case "gravity":
+            {
+                toggle("Block gravity is", ConfigEntry.ALLOW_GRAVITY);
+                break;
+            }
+
+            default:
+            {
+                msg("Available toggles: ");
+                for (String toggle : toggles)
+                {
+                    msg("- " + toggle);
+                }
+                return false;
+            }
         }
         return true;
     }
@@ -320,7 +315,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_warn.java

@@ -1,6 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 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.ChatColor;
@@ -53,15 +56,16 @@ public class Command_warn extends FreedomCommand
 
         String warnReason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         player.sendTitle(ChatColor.RED + "You've been warned.", ChatColor.YELLOW + "Reason: " + warnReason, 20, 100, 60);
-        msg(ChatColor.GREEN + "You have successfully warned " + player.getName());
+        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
+        plugin.pl.getPlayer(player).incrementWarnings(quiet);
+        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.WARN, warnReason));
 
         if (quiet)
         {
-            msg("Warned " + player.getName() + " quietly");
-            return true;
+            msg("You have successfully warned " + player.getName() + " quietly.");
         }
-
-        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
+        else
+        {
             String adminNotice = ChatColor.RED +
                     sender.getName() +
                     " - " +
@@ -71,7 +75,9 @@ public class Command_warn extends FreedomCommand
                     ChatColor.YELLOW +
                     warnReason;
             plugin.al.messageAllAdmins(adminNotice);
-        plugin.pl.getPlayer(player).incrementWarnings();
+
+            msg("You have successfully warned " + player.getName() + ".");
+        }
         return true;
     }
 }

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"),
     //
@@ -89,7 +91,7 @@ public enum ConfigEntry
     PTERO_DEFAULT_EMAIL_DOMAIN(String.class, "ptero.default_email_domain"),
     PTERO_SERVER_UUID(String.class, "ptero.server_uuid"),
     PTERO_ADMIN_KEY(String.class, "ptero.admin_key"),
-    PTERO_SERVER_KEY(String.class, "ptero.server_key"),
+    PTERO_CLIENT_KEY(String.class, "ptero.client_key"),
     //
     SHOP_ENABLED(Boolean.class, "shop.enabled"),
     SHOP_TITLE(String.class, "shop.title"),
@@ -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())
+            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);
+
+            if (!msg.getAttachments().isEmpty())
             {
-                if (TotalFreedomMod.getPlugin().al.isAdmin(player))
+                
+                logmessage.append(mediamessage); // Actually for logging...
+
+            }
+            FLog.info(logmessage.toString());
+
+            Bukkit.getOnlinePlayers().stream().filter(player -> TotalFreedomMod.getPlugin().al.isAdmin(player)).forEach(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 (format != null)
+                if (!Strings.isNullOrEmpty(format))
                 {
-                        Displayable display = TotalFreedomMod.getPlugin().rm.getDisplay(player);
+                    Displayable display = getDisplay(member);
                     net.md_5.bungee.api.ChatColor color = getColor(display);
                     String m = format.replace("%name%", member.getEffectiveName())
-                                .replace("%rank%", getDisplay(member))
+                            .replace("%rank%", display.getAbbr())
                             .replace("%rankcolor%", color.toString())
                             .replace("%msg%", FUtil.colorize(msg.getContentDisplay()));
-                        message.append(FUtil.colorize(m));
+                    builder.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);
-                    }
-                }
+                    builder.append(m);
                 }
 
-            ComponentBuilder builder = new ComponentBuilder(message.toString());
                 if (!msg.getAttachments().isEmpty())
                 {
                     for (Message.Attachment attachment : msg.getAttachments())
                     {
-                    if (attachment.getUrl() == null)
-                    {
-                        continue;
-                    }
-
-                    TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
+                        TextComponent text = new TextComponent(mediamessage);
                         text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
+                        if (!msg.getContentDisplay().isEmpty())
+                        {
+                            builder.append(" ");
+                        }
                         builder.append(text);
-                    message.append("[Media]"); // for logging
                     }
                 }
-
-            for (Player player : Bukkit.getOnlinePlayers())
-            {
-                if (TotalFreedomMod.getPlugin().al.isAdmin(player))
-                {
                 player.spigot().sendMessage(builder.create());
-                }
-            }
-            FLog.info(message.toString());
+
+            });
         }
     }
 
     // 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;
         }
     }
 }