FS-326 & quick formatting fix

The formatting of DiscordToMinecraft was adjusted in addition to make it look nicer

.github/dependabot.yml

@@ -1,23 +0,0 @@
-# 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@4.0.0
+        uses: codacy/codacy-analysis-cli-action@1.1.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

@@ -38,11 +38,10 @@ jobs:
       uses: actions/checkout@v2
       
     - name: Setup Java JDK
-      uses: actions/setup-java@v2.3.0
+      uses: actions/setup-java@v1.4.3
       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: 11
-        distribution: 'adopt'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/downstream.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         upstream_repository: AtlasMediaGroup/TotalFreedomMod
         upstream_branch: main
-        target_branch: development
+        target_branch: main
         git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
 
     # Step 3: Display a message if 'sync' step had new commits (simple test)

.github/workflows/java17-maven.yml

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

.travis.yml

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

SECURITY.md

@@ -11,23 +11,20 @@ These versions are currently actively supported by our team, and you should expe
 
 | Version             | Supported          | Support End:                   |
 | ------------------- | ------------------ | ------------------------------ |
-| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
+| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported          | Support End: |
 | ------------------- | ------------------ | ------------ |
-| 2021.06             | :white_check_mark: | October 2021 |
-
+| 2021.04             | :white_check_mark: | July 2021    |
 
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
-| 2021.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       |

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.09</version>
+    <version>2021.05</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -39,10 +39,9 @@
     </scm>
 
     <repositories>
-        
         <repository>
-            <id>atlas-nexus-01-totalfreedom-development</id>
-            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
 
         <repository>
@@ -102,11 +101,19 @@
         </repository>
 
         <repository>
-            <id>esentialsx-repo</id>
-            <url>https://repo.essentialsx.net/releases/</url>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</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>
@@ -114,14 +121,14 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.8.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.11</version>
             <scope>compile</scope>
         </dependency>
 
@@ -132,10 +139,17 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.speedxx</groupId>
+            <artifactId>Mojangson</artifactId>
+            <version>1957eef8d6</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>2.2.1</version>
+            <version>1.8</version>
             <scope>compile</scope>
         </dependency>
 
@@ -154,16 +168,23 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.AtlasMediaGroup</groupId>
+            <groupId>com.github.TotalFreedomMC</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>5a340341b0</version>
+            <version>48f01cf2fe</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.4</version>
+            <version>7.3.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.18.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -177,7 +198,7 @@
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.5</version>
+            <version>19.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -195,18 +216,25 @@
             <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>
             <version>v1.9</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>EssentialsX</artifactId>
-            <version>2.18.2</version>
-            <scope>compile</scope>
+            <groupId>net.goldtreeservers</groupId>
+            <artifactId>worldguardextraflags</artifactId>
+            <version>4.0.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -219,38 +247,36 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.28.0-GA</version>
+            <version>3.27.0-GA</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>me.totalfreedom</groupId>
-            <artifactId>tfguilds</artifactId>
-            <version>2021.06-RC2</version>
-            <scope>compile</scope>
+            <groupId>com.github.AtlasMediaGroup</groupId>
+            <artifactId>TFGuilds</artifactId>
+            <version>master-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>20.1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.2</version>
+            <version>3.1.1</version>
             <scope>compile</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.8.0</version>
+            <version>5.4.2</version>
             <scope>compile</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.eclipse.sisu</groupId>
             <artifactId>org.eclipse.sisu.inject</artifactId>
@@ -285,7 +311,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.9.10</version>
+                <version>4.0.2</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -326,7 +352,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -428,9 +454,10 @@
                                     <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>
@@ -448,7 +475,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.1.1</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <failOnViolation>true</failOnViolation>

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

@@ -85,10 +85,6 @@ 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/CommandSpy.java

@@ -25,6 +25,11 @@ 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,8 +2,6 @@ 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;
@@ -35,10 +33,7 @@ public class EntityWiper extends FreedomService
             @Override
             public void run()
             {
-                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
-                {
-                    wipeEntities(false);
-                }
+                wipeEntities(false);
             }
         }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }

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

@@ -4,6 +4,7 @@ import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import me.rayzr522.jsonmessage.JSONMessage;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -19,7 +20,6 @@ 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
 {
@@ -191,22 +191,6 @@ 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);
 

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

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

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

@@ -46,7 +46,7 @@ public class SavedFlags extends FreedomService
         return flags;
     }
 
-    public boolean getSavedFlag(String flag) throws Exception
+    public boolean getSavedFlag(String flag) throws IllegalStateException
     {
         Boolean flagValue = null;
 
@@ -66,7 +66,7 @@ public class SavedFlags extends FreedomService
         }
         else
         {
-            throw new Exception();
+            throw new IllegalStateException("Attempt to get non-existent flag " + flag);
         }
     }
 

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

@@ -43,7 +43,6 @@ 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,11 +171,6 @@ 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

@@ -146,12 +146,9 @@ public class EventBlocker extends FreedomService
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
             Entity entity = event.getEntity();
-            if (entity instanceof Tameable)
+            if (entity instanceof Tameable && ((Tameable) entity).isTamed())
             {
-                if (((Tameable)entity).isTamed())
-                {
-                    event.setCancelled(true);
-                }
+                event.setCancelled(true);
             }
         }
     }

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

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

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

@@ -101,12 +101,9 @@ public class BukkitTelnetBridge extends FreedomService
             try
             {
                 final Plugin bukkitTelnet = server.getPluginManager().getPlugin("BukkitTelnet");
-                if (bukkitTelnet != null)
+                if (bukkitTelnet instanceof BukkitTelnet)
                 {
-                    if (bukkitTelnet instanceof BukkitTelnet)
-                    {
-                        bukkitTelnetPlugin = (BukkitTelnet)bukkitTelnet;
-                    }
+                    bukkitTelnetPlugin = (BukkitTelnet) bukkitTelnet;
                 }
             }
             catch (Exception ex)

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

@@ -276,25 +276,8 @@ public class CoreProtectBridge extends FreedomService
         Block block = event.getClickedBlock();
         final CoreProtectAPI coreProtect = getCoreProtectAPI();
 
-        // TODO: Rewrite this
         if (data.hasInspection())
         {
-            int cooldownTime = 3;
-
-            // 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)
-                {
-                    event.setCancelled(true);
-                    player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                    return;
-                }
-            }
-
-            // Actual lookup time
             if (event.getAction() == Action.LEFT_CLICK_BLOCK)
             {
                 if (block != null)
@@ -302,6 +285,19 @@ public class CoreProtectBridge extends FreedomService
                     event.setCancelled(true);
                     List<String[]> 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());
@@ -366,7 +362,7 @@ public class CoreProtectBridge extends FreedomService
             }
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
-                if (block != null)
+                if (block != null && data.hasInspection())
                 {
                     BlockState blockState = block.getRelative(event.getBlockFace()).getState();
                     Block placedBlock = blockState.getBlock();
@@ -378,6 +374,19 @@ 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());

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

@@ -30,13 +30,10 @@ public class TFGuildsBridge extends FreedomService
         try
         {
             final Plugin tfGuilds = server.getPluginManager().getPlugin("TFGuilds");
-            if (tfGuilds != null && tfGuilds.isEnabled())
+            if (tfGuilds != null && tfGuilds.isEnabled() && tfGuilds instanceof TFGuilds)
             {
-                if (tfGuilds instanceof TFGuilds)
-                {
-                    enabled = true;
-                    return true;
-                }
+                enabled = true;
+                return true;
             }
         }
         catch (NoClassDefFoundError ex)

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,39 +60,28 @@ public class Command_ban extends FreedomCommand
         }
 
         final String username;
-        final String ip;
+        final List<String> ips = new ArrayList<>();
 
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            // Gets the IP using Essentials data if available
-            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            final PlayerData entry = plugin.pl.getData(args[0]);
+
+            if (entry == 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(PLAYER_NOT_FOUND);
-                    return true;
-                }
-                else
-                {
-                    username = entry.getName();
-                    ip = entry.getIps().get(0);
-                }
+                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                return true;
             }
+
+            username = entry.getName();
+            ips.addAll(entry.getIps());
         }
         else
         {
+            final PlayerData entry = plugin.pl.getData(player);
             username = player.getName();
-            ip = FUtil.getIp(player);
+            //ips.addAll(entry.getIps());/
+            ips.add(FUtil.getIp(player));
 
             // Deop
             player.setOp(false);
@@ -137,6 +126,7 @@ public class Command_ban extends FreedomCommand
 
         // Ban player
         Ban ban;
+
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, null, reason);
@@ -145,8 +135,12 @@ public class Command_ban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, null, reason);
         }
-        ban.addIp(ip);
 
+        for (String ip : ips)
+        {
+            ban.addIp(ip);
+            ban.addIp(FUtil.getFuzzyIp(ip));
+        }
         plugin.bm.addBan(ban);
 
 
@@ -160,7 +154,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: " + ip);
+            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
             FUtil.adminAction(sender.getName(), bcast.toString(), true);
         }
 
@@ -178,7 +172,7 @@ public class Command_ban extends FreedomCommand
         }
 
         // Log ban
-        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.BAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, reason));
 
         return true;
     }

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

@@ -1,8 +1,6 @@
 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;
@@ -77,11 +75,9 @@ public class Command_blockcmd extends FreedomCommand
         FPlayer playerdata = plugin.pl.getPlayer(player);
         if (!playerdata.allCommandsBlocked())
         {
-            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
             playerdata.setCommandsBlocked(true);
+            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), 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,8 +1,6 @@
 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;
@@ -130,8 +128,6 @@ 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,8 +1,6 @@
 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;
@@ -127,7 +125,6 @@ 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,8 +5,6 @@ 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;
@@ -77,43 +75,17 @@ public class Command_cage extends FreedomCommand
                 }
                 case "block":
                 {
-                    if (args.length >= 3)
+                    if (Material.matchMaterial(args[2]) != null)
                     {
-                        // 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;
-                        }
-                        else
-                        {
-                            msg("Invalid block!", ChatColor.RED);
-                            return true;
-                        }
+                        outerMaterial = Material.matchMaterial(args[2]);
+                        break;
                     }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                default:
-                {
-                    return false;
+                    msg("Invalid block!", ChatColor.RED);
+                    break;
                 }
             }
         }
 
-        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);
 
         if (skullName != null)
@@ -124,9 +96,17 @@ public class Command_cage extends FreedomCommand
         {
             fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
         }
+
         player.setGameMode(GameMode.SURVIVAL);
 
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.CAGE, null));
+        if (outerMaterial == Material.PLAYER_HEAD)
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+        }
+        else
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+        }
         return true;
     }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.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_cleanchat extends FreedomCommand
+public class Command_clearchat extends FreedomCommand
 {
 
     @Override
@@ -27,4 +27,4 @@ public class Command_cleanchat extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Cleared chat", true);
         return true;
     }
-}
+}

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

@@ -32,16 +32,14 @@ public class Command_deop extends FreedomCommand
         final List<String> matchedPlayerNames = new ArrayList<>();
         for (Player player : server.getOnlinePlayers())
         {
-            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
+            if ((player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
                     || player.getName().contains(targetName) || player.getDisplayName().contains(targetName))
+                    && player.isOp() && !plugin.al.isVanished(player.getName()))
             {
-                if (player.isOp() && !plugin.al.isVanished(player.getName()))
-                {
-                    matchedPlayerNames.add(player.getName());
-                    player.setOp(false);
-                    msg(player, YOU_ARE_NOT_OP);
-                    plugin.rm.updateDisplay(player);
-                }
+                matchedPlayerNames.add(player.getName());
+                player.setOp(false);
+                msg(player, YOU_ARE_NOT_OP);
+                plugin.rm.updateDisplay(player);
             }
         }
 

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

@@ -1,5 +1,6 @@
 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;
@@ -42,7 +43,7 @@ public class Command_doom extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
         FUtil.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
 
-        final String ip = FUtil.getIp(player);
+        final String ip = Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress().trim();
 
         // Remove from admin
         Admin admin = getAdmin(player);
@@ -75,7 +76,10 @@ public class Command_doom extends FreedomCommand
         // Ban player
         Ban ban = Ban.forPlayer(player, sender);
         ban.setReason((reason == null ? "FUCKOFF" : reason));
-        ban.addIp(ip);
+        for (String playerIp : plugin.pl.getData(player).getIps())
+        {
+            ban.addIp(playerIp);
+        }
         plugin.bm.addBan(ban);
 
         // Set gamemode to survival

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

@@ -1,50 +1,40 @@
 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 any entities that are riding you.", usage = "/<command>")
+@CommandParameters(description = "Eject players 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();
 
-        // Removes any entities from the sender's shoulders
-        if (playerSender.getShoulderEntityLeft() != null)
+        List<String> names = new ArrayList<>();
+
+        for (Entity entity : playerSender.getPassengers())
         {
-            playerSender.setShoulderEntityLeft(null);
-            count++;
-        }
-        if (playerSender.getShoulderEntityRight() != null)
-        {
-            playerSender.setShoulderEntityLeft(null);
-            count++;
+            names.add(entity.getName());
         }
 
-        // Removes anything riding the sender
-        playerSender.eject();
-
-        if (count != 0)
-        {
-            msg(count + " entit" + (count == 1 ? "y was" : "ies were") + " ejected.", ChatColor.GREEN);
-        }
-        else
+        if (names.isEmpty())
         {
             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_enchant.java

@@ -251,21 +251,18 @@ public class Command_enchant extends FreedomCommand
                 return getEnchantments(item);
             }
         }
-        else if (args.length == 3)
+        else if (args.length == 3 && args[0].equalsIgnoreCase("add"))
         {
-            if (args[0].equals("add"))
+            Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
+            if (enchantment != null)
             {
-                Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
-                if (enchantment != null)
+                if (!unsafe)
                 {
-                    if (!unsafe)
-                    {
-                        return stringNumberRange(1, enchantment.getMaxLevel());
-                    }
-                    else
-                    {
-                        return Collections.singletonList("[level]");
-                    }
+                    return stringNumberRange(1, enchantment.getMaxLevel());
+                }
+                else
+                {
+                    return Collections.singletonList("[level]");
                 }
             }
         }

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

@@ -64,12 +64,6 @@ 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(), "Unfreezing all players", false);
+                FUtil.adminAction(sender.getName(), "Disabling global player freeze", false);
                 msg("Players are now free to move.");
                 return true;
             }
 
-            FUtil.adminAction(sender.getName(), "Freezing all players", false);
+            FUtil.adminAction(sender.getName(), "Enabling global player freeze", false);
             for (Player player : server.getOnlinePlayers())
             {
                 if (!isAdmin(player))

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

@@ -0,0 +1,96 @@
+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])));
@@ -75,9 +75,7 @@ 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])));
@@ -124,9 +122,7 @@ 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])));
@@ -151,11 +147,6 @@ public class Command_manageshop extends FreedomCommand
                         msg("Invalid number: " + args[2], ChatColor.RED);
                         return true;
                     }
-                }
-                default:
-                {
-                    return false;
-                }
             }
         }
         else if (args[0].equals("items"))

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

@@ -116,12 +116,8 @@ public class Command_notes extends FreedomCommand
                 msg("Cleared " + count + " notes.", ChatColor.GREEN);
                 return true;
             }
-
-            default:
-            {
-                return false;
-            }
         }
+        return false;
     }
 
     @Override

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

@@ -1,8 +1,6 @@
 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;
@@ -58,13 +56,11 @@ 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));
 
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.ORBIT, null));
+        player.setVelocity(new Vector(0, strength, 0));
+        FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
         return true;
     }
 }

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

@@ -29,7 +29,6 @@ public class Command_potion extends FreedomCommand
         switch (args.length)
         {
             case 1:
-            {
                 if (args[0].equalsIgnoreCase("list"))
                 {
                     List<String> potionEffectTypeNames = new ArrayList<>();
@@ -59,10 +58,8 @@ public class Command_potion extends FreedomCommand
                         }
                     }
                 }
-            }
 
             case 2:
-            {
                 if (args[0].equalsIgnoreCase("clear"))
                 {
                     Player target = playerSender;
@@ -98,11 +95,9 @@ 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;
@@ -172,11 +167,8 @@ public class Command_potion extends FreedomCommand
                                     + (!target.equals(playerSender) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA);
                 }
                 break;
-            }
             default:
-            {
                 return false;
-            }
         }
         return true;
     }
@@ -187,17 +179,14 @@ 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))
@@ -210,28 +199,22 @@ 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"))
@@ -240,12 +223,6 @@ public class Command_potion extends FreedomCommand
                     }
                 }
                 break;
-            }
-
-            default:
-            {
-                break;
-            }
         }
 
         return Collections.emptyList();

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

@@ -0,0 +1,41 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Release parrots from your shoulders.", usage = "/<command>", aliases = "removeparrots")
+public class Command_releaseparrots extends FreedomCommand
+{
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        Entity leftShoulderEntity = playerSender.getShoulderEntityLeft();
+        Entity rightShoulderEntity = playerSender.getShoulderEntityRight();
+
+        if (rightShoulderEntity == null && leftShoulderEntity == null)
+        {
+            msg("No parrots were detected on either of your shoulders.");
+            return true;
+        }
+
+        if (leftShoulderEntity != null && leftShoulderEntity.getType().equals(EntityType.PARROT))
+        {
+            playerSender.setShoulderEntityLeft(null);
+            msg("Removed the parrot on your left shoulder.");
+        }
+
+        if (rightShoulderEntity != null && rightShoulderEntity.getType().equals(EntityType.PARROT))
+        {
+            playerSender.setShoulderEntityRight(null);
+            msg("Removed the parrot on your right shoulder.");
+        }
+        return true;
+    }
+}

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

@@ -1,97 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.chat.TranslatableComponent;
-import net.md_5.bungee.api.chat.hover.content.Text;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-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.NON_OP, source = SourceType.BOTH)
-@CommandParameters(description = "Get the seed of the world you are currently in.", usage = "/seed [world]")
-public class Command_seed extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        World world;
-
-        if (args.length > 0)
-        {
-            world = server.getWorld(args[0]);
-            if (world == null)
-            {
-                msg("That world could not be found", ChatColor.RED);
-                return true;
-            }
-        }
-        else
-        {
-            // If the sender is a Player, use that world. Otherwise, use the overworld as a fallback.
-            if (!senderIsConsole)
-            {
-                world = playerSender.getWorld();
-            }
-            else
-            {
-                world = server.getWorlds().get(0);
-            }
-        }
-
-        // If the sender is not a Player, use the usual msg method to
-        if (senderIsConsole)
-        {
-            msg("Seed: [" + ChatColor.GREEN + world.getSeed() + ChatColor.WHITE + "]", ChatColor.WHITE);
-        }
-        else
-        {
-            // Gets the seed for later uses
-            String seed = String.valueOf(world.getSeed());
-
-            // This is a really stupid hack to get things to play nicely, but it works so I don't give a damn
-            BaseComponent[] components = {new TranslatableComponent("chat.copy.click")};
-            TextComponent seedAsComponent = new TextComponent(seed);
-
-            // Style the message like in vanilla Minecraft.
-            seedAsComponent.setColor(ChatColor.GREEN.asBungee());
-            seedAsComponent.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, seed));
-            seedAsComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(components)));
-
-            // Enclose the seed with brackets
-            TextComponent seedString = new TextComponent("[");
-            seedString.addExtra(seedAsComponent);
-            seedString.addExtra("]");
-
-            // Send the message to the player.
-            TranslatableComponent response = new TranslatableComponent("commands.seed.success", seedString);
-            playerSender.spigot().sendMessage(response);
-        }
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            // Returns a list of worlds on the server and returns it
-            List<String> worlds = new ArrayList<>();
-            for (World world : server.getWorlds())
-            {
-                worlds.add(world.getName());
-            }
-            return worlds;
-        }
-
-        return null;
-    }
-}

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

@@ -0,0 +1,49 @@
+package me.totalfreedom.totalfreedommod.command;
+
+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.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Sets your experience level (XP).", usage = "/<command> [level]")
+public class Command_setlevel extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        int new_level;
+
+        try
+        {
+            new_level = Integer.parseInt(args[0]);
+
+            if (new_level < 0)
+            {
+                new_level = 0;
+            }
+            else if (new_level > 50)
+            {
+                new_level = 50;
+            }
+        }
+        catch (NumberFormatException ex)
+        {
+            msg("Invalid level.", ChatColor.RED);
+            return true;
+        }
+
+        playerSender.setLevel(new_level);
+
+        msg("Your XP level is now set to " + ChatColor.GOLD + new_level);
+
+        return true;
+    }
+}

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

@@ -105,11 +105,6 @@ public class Command_tag extends FreedomCommand
                     }
                     return true;
                 }
-
-                default:
-                {
-                    return false;
-                }
             }
         }
         else if (args.length >= 2)
@@ -284,11 +279,6 @@ public class Command_tag extends FreedomCommand
                     msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : "") + from + to);
                     return true;
                 }
-
-                default:
-                {
-                    return false;
-                }
             }
         }
         return false;

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

@@ -0,0 +1,143 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+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.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> [-q] <username> [reason]", aliases = "noob")
+public class Command_tban extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean quiet = args[0].equalsIgnoreCase("-q");
+        if (quiet)
+        {
+            args = org.apache.commons.lang3.ArrayUtils.subarray(args, 1, args.length);
+
+            if (args.length < 1)
+            {
+                return false;
+            }
+        }
+
+        final String username;
+
+        final Player player = getPlayer(args[0]);
+        final PlayerData entry;
+        if (player == null)
+        {
+            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.");
+                return true;
+            }
+
+            username = entry.getName();
+        }
+        else
+        {
+            entry = plugin.pl.getData(player);
+            username = player.getName();
+        }
+        final List<String> ips = new ArrayList<>(entry.getIps());
+
+        String reason = null;
+        if (args.length > 1)
+        {
+            reason = StringUtils.join(args, " ", 1, args.length);
+        }
+
+        StringBuilder kick = new StringBuilder()
+                .append(ChatColor.RED)
+                .append("You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
+
+        if (!quiet)
+        {
+            // Strike with lightning
+            if (player != null)
+            {
+                final Location targetPos = player.getLocation();
+                for (int x = -1; x <= 1; x++)
+                {
+                    for (int z = -1; z <= 1; z++)
+                    {
+                        final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                        Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
+                    }
+                }
+
+                // Kill player
+                player.setHealth(0.0);
+
+                if (reason != null)
+                {
+                    FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes - Reason: " + reason, true);
+                    kick.append("\n")
+                            .append(ChatColor.RED)
+                            .append("Reason: ")
+                            .append(ChatColor.GOLD)
+                            .append(reason);
+                }
+                else
+                {
+                    FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes", true);
+                }
+            }
+        }
+        else
+        {
+            if (player != null)
+            {
+                if (reason != null)
+                {
+                    msg("Quietly temporarily banned " + player.getName() + " for 5 minutes.");
+                    kick.append("\n")
+                            .append(ChatColor.RED)
+                            .append("Reason: ")
+                            .append(ChatColor.GOLD)
+                            .append(reason);
+                }
+            }
+        }
+
+        // Ban player
+        Ban ban = Ban.forPlayerName(username, sender, FUtil.parseDateOffset("5m"), reason);
+        for (String ip : ips)
+        {
+            ban.addIp(ip);
+        }
+        plugin.bm.addBan(ban);
+
+        // Kick player
+        if (player != null)
+        {
+            player.kickPlayer(kick.toString());
+        }
+
+        // Log ban
+        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.TEMPBAN, reason));
+        return true;
+    }
+}

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

@@ -1,10 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+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;
@@ -21,7 +21,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [-q] <username> [duration] [reason]", aliases = "tban,noob")
+@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [-q] <username> [duration] [reason]")
 public class Command_tempban extends FreedomCommand
 {
 
@@ -47,72 +47,49 @@ public class Command_tempban extends FreedomCommand
         }
 
         final String username;
-        final String ip;
+        final List<String> ips = new ArrayList<>();
 
         final Player player = getPlayer(args[0]);
-        PlayerData entry;
+        final PlayerData entry;
         if (player == null)
         {
-            // Gets the IP using Essentials data if available
-            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            entry = plugin.pl.getData(args[0]);
+
+            if (entry == 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
-            {
-                entry = plugin.pl.getData(args[0]);
-                if (entry == null)
-                {
-                    msg(PLAYER_NOT_FOUND);
-                    return true;
-                }
-                else
-                {
-                    username = entry.getName();
-                    ip = entry.getIps().get(0);
-                }
+                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                return true;
             }
+
+            username = entry.getName();
+            ips.addAll(entry.getIps());
         }
         else
         {
+            entry = plugin.pl.getData(player);
             username = player.getName();
-            ip = FUtil.getIp(player);
+            ips.add(FUtil.getIp(player));
         }
 
         final StringBuilder message = new StringBuilder("Temporarily banned " + username);
 
-        // Default expiration date is 5 minutes
-        Date expires = FUtil.parseDateOffset("5m");
-
-        // Parses what comes after as a duration
-        if (args.length > 1)
-        {
-            try
-            {
-                expires = FUtil.parseDateOffset(args[1]);
-            }
-            catch (NumberFormatException error)
-            {
-                msg("Invalid duration: " + args[1], ChatColor.RED);
-                return true;
-            }
-        }
-
+        Date expires = FUtil.parseDateOffset("30m");
         message.append(" until ").append(date_format.format(expires));
 
-        // If a reason appears to exist, set it.
         String reason = null;
-        if (args.length > 2)
+        if (args.length >= 2)
         {
-            reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
+            Date parsed_offset = FUtil.parseDateOffset(args[1]);
+            reason = StringUtils.join(ArrayUtils.subarray(args, parsed_offset == null ? 1 : 2, args.length), " ") + " (" + sender.getName() + ")";
+            if (parsed_offset != null)
+            {
+                expires = parsed_offset;
+            }
             message.append(", Reason: \"").append(reason).append("\"");
         }
 
         Ban ban;
+
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, expires, reason);
@@ -121,8 +98,11 @@ public class Command_tempban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, expires, reason);
         }
-        ban.addIp(ip);
 
+        for (String ip : ips)
+        {
+            ban.addIp(ip);
+        }
         plugin.bm.addBan(ban);
 
         if (!quiet)
@@ -139,8 +119,6 @@ public class Command_tempban extends FreedomCommand
                         Objects.requireNonNull(targetPos.getWorld()).strikeLightningEffect(strike_pos);
                     }
                 }
-
-                player.kickPlayer(ban.bakeKickMessage());
             }
 
             FUtil.adminAction(sender.getName(), message.toString(), true);
@@ -150,15 +128,19 @@ public class Command_tempban extends FreedomCommand
             msg("Quietly temporarily banned " + username + ".");
         }
 
-        for (Player p : Bukkit.getOnlinePlayers())
+        if (player != null)
         {
-            if (FUtil.getIp(p).equals(ip))
+            player.kickPlayer(ban.bakeKickMessage());
+            for (Player p : Bukkit.getOnlinePlayers())
             {
-                p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
+                if (FUtil.getIp(p).equals(FUtil.getIp(player)))
+                {
+                    p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
+                }
             }
         }
 
-        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.TEMPBAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.TEMPBAN, reason));
         return true;
     }
 }

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

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

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

@@ -1,9 +1,12 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import com.earth2me.essentials.User;
+import java.util.ArrayList;
+import java.util.List;
+import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,33 +22,20 @@ public class Command_unban extends FreedomCommand
         if (args.length > 0)
         {
             String username;
-            String ip;
+            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)
+            if (entry == null)
             {
-                User essUser = plugin.esb.getEssentialsUser(args[0]);
-                //
-                username = essUser.getName();
-                ip = essUser.getLastLoginAddress();
-            }
-            // Secondary method - using Essentials if available
-            else
-            {
-                final PlayerData entry = plugin.pl.getData(args[0]);
-                if (entry == null)
-                {
-                    msg(PLAYER_NOT_FOUND);
-                    return true;
-                }
-                username = entry.getName();
-                ip = entry.getIps().get(0);
+                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                return true;
             }
 
+            username = entry.getName();
+            final List<String> ips = new ArrayList<>(entry.getIps());
+
             FUtil.adminAction(sender.getName(), "Unbanning " + username, true);
+            msg(username + " has been unbanned along with the following IPs: " + StringUtils.join(ips, ", "));
             plugin.bm.removeBan(plugin.bm.getByUsername(username));
-            plugin.bm.removeBan(plugin.bm.getByIp(ip));
-            msg(username + " has been unbanned along with the IP: " + ip);
 
             if (args.length >= 2)
             {
@@ -55,6 +45,20 @@ public class Command_unban extends FreedomCommand
                     msg("Restored edits for: " + username);
                 }
             }
+
+            for (String ip : ips)
+            {
+                Ban ban = plugin.bm.getByIp(ip);
+                if (ban != null)
+                {
+                    plugin.bm.removeBan(ban);
+                }
+                ban = plugin.bm.getByIp(FUtil.getFuzzyIp(ip));
+                if (ban != null)
+                {
+                    plugin.bm.removeBan(ban);
+                }
+            }
             return true;
         }
         return false;

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

@@ -1,9 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -56,28 +53,25 @@ public class Command_warn extends FreedomCommand
 
         String warnReason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         player.sendTitle(ChatColor.RED + "You've been warned.", ChatColor.YELLOW + "Reason: " + warnReason, 20, 100, 60);
-        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
-        plugin.pl.getPlayer(player).incrementWarnings(quiet);
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.WARN, warnReason));
+        msg(ChatColor.GREEN + "You have successfully warned " + player.getName());
 
         if (quiet)
         {
-            msg("You have successfully warned " + player.getName() + " quietly.");
+            msg("Warned " + player.getName() + " quietly");
+            return true;
         }
-        else
-        {
-            String adminNotice = ChatColor.RED +
-                    sender.getName() +
-                    " - " +
-                    "Warning: " +
-                    player.getName() +
-                    " - Reason: " +
-                    ChatColor.YELLOW +
-                    warnReason;
-            plugin.al.messageAllAdmins(adminNotice);
 
-            msg("You have successfully warned " + player.getName() + ".");
-        }
+        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
+        String adminNotice = ChatColor.RED +
+                sender.getName() +
+                " - " +
+                "Warning: " +
+                player.getName() +
+                " - Reason: " +
+                ChatColor.YELLOW +
+                warnReason;
+        plugin.al.messageAllAdmins(adminNotice);
+        plugin.pl.getPlayer(player).incrementWarnings();
         return true;
     }
 }

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

@@ -165,8 +165,6 @@ public enum ConfigEntry
     ADMIN_INFO(List.class, "admininfo"),
     VOTING_INFO(List.class, "votinginfo"),
     MASTER_BUILDER_INFO(List.class, "masterbuilderinfo"),
-    FIRST_JOIN_INFO(List.class, "first_join_info.text"),
-    FIRST_JOIN_INFO_ENABLED(Boolean.class, "first_join_info.enabled"),
     AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
     TOGGLE_CHAT(Boolean.class, "toggle_chat"),
     DEVELOPER_MODE(Boolean.class, "developer_mode"),

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

@@ -22,46 +22,47 @@ public class DiscordToMinecraftListener extends ListenerAdapter
     public void onMessageReceived(MessageReceivedEvent event)
     {
         String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
-        if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id))
+        if (event.getMember() != null && !chat_channel_id.isEmpty()
+                && event.getChannel().getId().equals(chat_channel_id)
+                && !event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
         {
-            if (!event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+            Member member = event.getMember();
+            String tag = getDisplay(member);
+            StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord"
+                    + ChatColor.DARK_GRAY + "]");
+            Message msg = event.getMessage();
+            if (tag != null)
             {
-                Member member = event.getMember();
-                String tag = getDisplay(member);
-                StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "]");
-                Message msg = event.getMessage();
-                if (tag != null)
-                {
-                    message.append(" ").append(tag);
-                }
-                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
-                ComponentBuilder builder = new ComponentBuilder(message.toString());
-                if (!msg.getContentDisplay().isEmpty())
-                {
-                    builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay()));
-                    message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging
-                }
-                if (!msg.getAttachments().isEmpty())
-                {
-                    for (Message.Attachment attachment : msg.getAttachments())
-                    {
-                        attachment.getUrl();
-                        builder.append(" ");
-                        TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
-                        text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
-                        builder.append(text);
-                        message.append(" [Media]"); // for logging
-                    }
-                }
-                for (Player player : Bukkit.getOnlinePlayers())
-                {
-                    if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
-                    {
-                        player.spigot().sendMessage(builder.create());
-                    }
-                }
-                FLog.info(message.toString());
+                message.append(" ").append(tag);
             }
+            message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName()))
+                    .append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
+            ComponentBuilder builder = new ComponentBuilder(message.toString());
+            if (!msg.getContentDisplay().isEmpty())
+            {
+                builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay()));
+                message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging
+            }
+            if (!msg.getAttachments().isEmpty())
+            {
+                for (Message.Attachment attachment : msg.getAttachments())
+                {
+                    attachment.getUrl();
+                    builder.append(" ");
+                    TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
+                    text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
+                    builder.append(text);
+                    message.append(" [Media]"); // for logging
+                }
+            }
+            for (Player player : Bukkit.getOnlinePlayers())
+            {
+                if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
+                {
+                    player.spigot().sendMessage(builder.create());
+                }
+            }
+            FLog.info(message.toString());
         }
     }
 

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

@@ -128,7 +128,7 @@ public class ItemFun extends FreedomService
 
             LivingEntity livingEntity = (LivingEntity)event.getRightClicked();
             EntityType entityType = livingEntity.getType();
-            if (entityType != fPlayer.mobThrowerCreature())
+            if (!(entityType == fPlayer.mobThrowerCreature()))
             {
                 return;
             }
@@ -304,11 +304,6 @@ public class ItemFun extends FreedomService
                 }
                 break;
             }
-            default:
-            {
-                // Do nothing
-                break;
-            }
         }
     }
 

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

@@ -73,7 +73,7 @@ public class Landminer extends FreedomService
                 continue;
             }
 
-            if (player.getLocation().distanceSquared(location) > (landmine.radius * landmine.radius))
+            if (!(player.getLocation().distanceSquared(location) <= (landmine.radius * landmine.radius)))
             {
                 break;
             }

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

@@ -79,20 +79,11 @@ public class Module_list extends HTTPDModule
                     switch (admin.getRank())
                     {
                         case ADMIN:
-                        {
                             admins.add(player.getName());
                             break;
-                        }
                         case SENIOR_ADMIN:
-                        {
                             senioradmins.add(player.getName());
                             break;
-                        }
-                        default:
-                        {
-                            // Do nothing
-                            break;
-                        }
                     }
                 }
             }

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

@@ -51,20 +51,11 @@ public class Module_players extends HTTPDModule
             switch (admin.getRank())
             {
                 case ADMIN:
-                {
                     admins.add(username);
                     break;
-                }
                 case SENIOR_ADMIN:
-                {
                     senioradmins.add(username);
                     break;
-                }
-                default:
-                {
-                    // Do nothing
-                    break;
-                }
             }
         }
 

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

@@ -1,5 +1,7 @@
 package me.totalfreedom.totalfreedommod.player;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.caging.CageData;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -14,12 +16,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class FPlayer
 {
-
     public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;
 
 
@@ -249,7 +247,7 @@ public class FPlayer
     public void startArrowShooter(TotalFreedomMod plugin)
     {
         this.stopArrowShooter();
-        this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L);
+        this.mp44ScheduleTask = new ArrowShooter(this.player).runTaskTimer(plugin, 1L, 1L);
         this.mp44Firing = true;
     }
 
@@ -431,19 +429,14 @@ public class FPlayer
         this.warningCount = warningCount;
     }
 
-    public void incrementWarnings(boolean quiet)
+    public void incrementWarnings()
     {
         this.warningCount++;
 
         if (this.warningCount % 2 == 0)
         {
             Player p = getPlayer();
-
-            if (!quiet)
-            {
-                p.getWorld().strikeLightning(p.getLocation());
-            }
-
+            p.getWorld().strikeLightning(p.getLocation());
             FUtil.playerMsg(p, ChatColor.RED + "You have been warned at least twice now, make sure to read the rules at " + ConfigEntry.SERVER_BAN_URL.getString());
         }
     }
@@ -711,11 +704,8 @@ public class FPlayer
         @Override
         public void run()
         {
-            if (player != null)
-            {
-                Arrow shot = player.launchProjectile(Arrow.class);
-                shot.setVelocity(shot.getVelocity().multiply(2.0));
-            }
+            Arrow shot = player.launchProjectile(Arrow.class);
+            shot.setVelocity(shot.getVelocity().multiply(2.0));
         }
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/punishments/PunishmentType.java

@@ -7,11 +7,5 @@ public enum PunishmentType
     KICK,
     TEMPBAN,
     BAN,
-    DOOM,
-    WARN,
-    CAGE,
-    BLOCKEDIT,
-    BLOCKPVP,
-    BLOCKCMD,
-    ORBIT
+    DOOM
 }

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

@@ -54,12 +54,13 @@ public class FUtil
             "d018f2b8-ce60-4672-a45f-e580e0331299", // speednt
             "458de06f-36a5-4e1b-aaa6-ec1d1751c5b6", // SupItsDillon
             "c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
+            "38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
             "ba5aafba-9012-418f-9819-a7020d591068",  // TFTWPhoenix
             "d6dd9740-40db-45f5-ab16-4ee16a633009", // Abhi
             "2e06e049-24c8-42e4-8bcf-d35372af31e6", // NotInSync
             "f97c0d7b-6413-4558-a409-88f09a8f9adb" // videogamesm12
     );
-    public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "TFTWPhoenix", "abhithedev", "NotInSync", "videogamesm12");
+    public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix", "abhithedev", "NotInSync", "videogamesm12");
     public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
     public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
             ChatColor.DARK_RED,

src/main/resources/config.yml

@@ -206,7 +206,7 @@ allow:
   fire_spread: false
   fluid_spread: false
   lava_place: true
-  lava_damage: true
+  lava_damage: false
   water_place: true
   tnt_minecarts: false
   explosions: false
@@ -590,14 +590,6 @@ masterbuilderinfo:
   - ' &2- Template:'
   - '&9https://forum.totalfreedom.me/d/336-master-builder-application-process'
 
-# What new players will see upon joining for the first time.
-first_join_info:
-  enabled: true
-  text:
-    - "&6Welcome to TotalFreedom -- the original Free-OP server!"
-    - "&eThe server's name doesn't mean we have no rules. Do &6/rules &efor a list of them."
-    - "&aNeed help getting started? Do &2/help &aor a list of commands!"
-
 # Famous players - cannot be banned by username
 famous_players:
   - honeydew

src/main/resources/permissions.yml

@@ -1,50 +1,16 @@
 #
-# TotalFreedomMod 5.5 Permissions
+# TotalFreedomMod Permissions
 # by ZeroEpoch1969
 #
 
 # Note that every group inherits the previous groups' permissions
-# Meaning Telnet Admins have the permissions of Operators and Super Admins, and etc
+# Meaning Senior Admins have the permissions of Operators and Admins, and etc
 
 # This is used to remove all permission begging with the root node
 # This is useful when a plugin gives all permissions to a player because they are opped
 remove:
   - "voxelsniper"
-  - "bending.admin"
-  - "bending.ability.Cleanse"
-  - "worldedit.brush.apply"
-  - "essentials.near.exclude"
-  - "plots.admin"
-  - "plots.debugroadregen"
-  - "plots.debugclaimtest"
-  - "plots.debugpaste"
-  - "plots.debugallowunsafe"
-  - "plots.debugloadtest"
-  - "plots.debugsavetest"
-  - "plots.cluster"
-  #Crackshot
-  - "crackshot.bypass.all"
-  #NetworkManager
-  - "networkmanager.*" 
-  - "networkmanager.notify.joinbanned"
-  - "networkmanager.notify.*"
-  - "networkmanager.announce.global"
-  - "networkmanager.announce"
-  - "networkmanager.chatlock"
-  - "networkmanager.clearchat.bypass"
-  - "networkmanager.clearchat.*"
-  - "networkmanager.notify.ticket.new"
-  - "networkmanager.lookup"
-  - "networkmanager.maintenance.*"
-  - "networkmanager.permissions"
-  - "networkmanager.reports"
-  - "networkmanager.tickets"
-  - "networkmanager.chatlock.bypass"
-  - "networkmanager.anticaps.bypass"
-  - "networkmanager.antispam.bypass"
-  - "networkmanager.commandblocker.bypass"
-  - "networkmanager.tags.*"
-
+  - "bending"
 
 # Operator permission nodes
 operators:
@@ -70,79 +36,16 @@ operators:
   - "worldedit.removebelow"
   - "worldedit.removenear"
   - "worldedit.replacenear"
-  - "worldedit.brush.*"
-  - "worldedit.global-mask"
-  - "worldedit.fill"
-  - "worldedit.fill.recursive"
+
   # LibsDisguises
   - "libsdisguises.noactionbar"
-  
+
   # WorldGuard
   - "worldguard.region.list.own"
   - "worldguard.region.addmember.own.*"
   - "worldguard.region.removemember.own.*"
   - "worldguard.region.info.*"
 
-  # Bending
-  - "bending.command.add"
-  - "bending.command.bind"
-  - "bending.command.check"
-  - "bending.command.choose"
-  - "bending.command.rechoose"
-  - "bending.command.clear"
-  - "bending.command.copy"
-  - "bending.command.display"
-  - "bending.command.help"
-  - "bending.command.invincible"
-  - "bending.command.preset"
-  - "bending.command.preset.list"
-  - "bending.command.preset.create"
-  - "bending.command.preset.delete"
-  - "bending.command.preset.bind"
-  - "bending.command.preset.bind.assign"
-  - "bending.command.preset.bind.external"
-  - "bending.command.toggle"
-  - "bending.command.version"
-  - "bending.command.who"
-  - "bending.earth"
-  - "bending.air"
-  - "bending.fire"
-  - "bending.water"
-  - "bending.water.bloodbending.anytime"
-  - "bending.ability.AvatarState"
-  - "bending.command.add.chi"
-  - "bending.command.choose.chi"
-  - "bending.ability.Paralyze"
-  - "bending.ability.RapidPunch"
-  - "bending.ability.Smokescreen"
-  - "bending.ability.WarriorStance"
-  - "bending.ability.AcrobatStance"
-  - "bending.ability.QuickStrike"
-  - "bending.ability.SwiftKick"
-  - "bending.ability.ChiCombo"
-  - "bending.chi.passive"
-  - "bending.ability.MetalClips.throw"
-  - "bending.ability.AirCombo"
-  - "bending.ability.Flight"
-  - "bending.ability.WaterCombo"
-  - "bending.ability.EarthCombo"
-  - "bending.ability.FireCombo"
-  - "bending.ability.ChiCombo"
-  - "bending.air.passive"
-  - "bending.chi.passive"
-  - "bending.earth.passive"
-  - "bending.fire.passive"
-  - "bending.water.passive"
-  # NetworkManager
-  - "networkmanager.chatlog"
-  - "networkmanager.find"
-  - "networkmanager.gtps"
-  - "networkmanager.lookup"
-  - "networkmanager.slashserver.*"
-  - "networkmanager.notification.join"
-  - "networkmanager.party.nolimit"
-  - "networkmanager.tabcompletechat"
-  
 # Master Builder permission nodes
 master_builders:
   - "worldedit.tool.*"
@@ -156,25 +59,13 @@ master_builders:
   - "voxelsniper.sniper"
   - "voxelsniper.goto"
   - "voxelsniper.brush.*"
-  
+
 # Admin permission nodes
 admins:
+  - "coreprotect.*"
   - "worldedit.*"
   - "worldguard.*"
-  - "bending.admin.remove"
-  - "bending.command.toggle.all"
-  - "bending.admin.toggle"
-  - "bending.command.reload"
-  - "plots.cluster"
-  - "networkmanager.adminchat"
-  - "networkmanager.announce.server"
-  - "networkmanager.socialspy"
-  - "networkmanager.fullproxy.bypass"
-  - "networkmanager.lookup.ip"
-  #Crackshot
-  - "crackshot.bypass.all"
+  - "bending.*"
 
 # Senior Admin permission nodes
-senior_admins: 
-  - "bending.admin.permaremove"
-  - "bending.ability.Cleanse"
+senior_admins: []