Merge https://github.com/EssentialsX/Essentials into 1.16

.checkstyle/checkstyle.xml

@@ -24,7 +24,7 @@
 
     <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
     <module name="SuppressionFilter">
-        <property name="file" value="${checkstyle.suppressions.file}"/>
+        <property name="file" value="${configDirectory}/suppressions.xml"/>
     </module>
 
     <!-- https://checkstyle.org/config_filters.html#SuppressWithPlainTextCommentFilter -->

.github/workflows/build.yml

@@ -2,37 +2,47 @@ name: Build EssentialsX
 
 on:
   push:
-    branches: 
+    branches:
     - 2.x
     - mc/*
   pull_request:
-    branches: 
+    branches:
     - 2.x
 
 jobs:
   build:
-
+    name: Build and upload
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout Git repo
-      uses: actions/checkout@v1
-    - name: Restore Maven cache
-      uses: actions/cache@v1
+      uses: actions/checkout@v2
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        fetch-depth: 0
+    - name: Restore Gradle cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
         restore-keys: |
-          ${{ runner.os }}-maven-
+          ${{ runner.os }}-gradle-
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Build with Maven
-      run: mvn package verify --file pom.xml
-    - name: Copy artifacts
-      run: mkdir -p ./out/ && cp -t ./out/ **/target/Essentials*.jar
-    - uses: actions/upload-artifact@master
+    - name: Build with Gradle
+      run: |
+        chmod +x gradlew
+        ./gradlew build --stacktrace
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@master
       with:
-        name: Plugin jars
-        path: out/
+        name: EssentialsX plugin jars
+        path: jars/
+    - name: Deploy with Gradle
+      if: ${{ success() && github.event_name == 'push' && github.repository == 'EssentialsX/Essentials' && github.ref == 'refs/heads/2.x' }}
+      env:
+        ORG_GRADLE_PROJECT_essxUsername: ${{ secrets.ESSENTIALSX_DEPLOY_USERNAME }}
+        ORG_GRADLE_PROJECT_essxPassword: ${{ secrets.ESSENTIALSX_DEPLOY_PASSWORD }}
+      run: |
+        ./gradlew publish

.gitignore

@@ -17,6 +17,9 @@
 /Essentials/usermap.csv
 
 # Build files
-target/
+.gradle/
 jars/
 out/
+build/
+target/
+*.class

.idea/checkstyle-idea.xml

@@ -9,7 +9,7 @@
         <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
         <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
         <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/.checkstyle/checkstyle.xml:EssentialsX" />
-        <entry key="property-2.checkstyle.suppressions.file" value=".checkstyle/suppressions.xml" />
+        <entry key="property-2.configDirectory" value=".checkstyle/" />
         <entry key="scan-before-checkin" value="false" />
         <entry key="scanscope" value="JavaOnly" />
         <entry key="suppress-errors" value="false" />

Essentials/build.gradle

@@ -0,0 +1,29 @@
+dependencies {
+    compileOnly('com.github.milkbowl:VaultAPI:1.7') {
+        exclude group: "org.bukkit", module: "bukkit"
+    }
+    compileOnly 'net.luckperms:api:5.0'
+
+    api 'io.papermc:paperlib:1.0.6'
+
+    // Providers
+    api project(':providers:BaseProviders')
+    api project(':providers:PaperProvider')
+    api(project(':providers:NMSReflectionProvider')) {
+        exclude group: "org.bukkit", module: "bukkit"
+    }
+    api(project(':providers:1_8Provider')) {
+        exclude group: "org.bukkit", module: "bukkit"
+    }
+}
+
+shadowJar {
+    dependencies {
+        include (dependency('io.papermc:paperlib'))
+        include (project(':providers:BaseProviders'))
+        include (project(':providers:PaperProvider'))
+        include (project(':providers:NMSReflectionProvider'))
+        include (project(':providers:1_8Provider'))
+    }
+    relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
+}

Essentials/pom.xml

@@ -1,118 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.ess3</groupId>
-        <artifactId>EssentialsXParent</artifactId>
-        <version>2.18.2</version>
-    </parent>
-
-    <artifactId>EssentialsX</artifactId>
-
-    <build>
-        <finalName>EssentialsX-${full.version}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-                <configuration>
-                    <showDeprecation>false</showDeprecation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <relocation>
-                            <pattern>io.papermc.lib</pattern>
-                            <shadedPattern>com.earth2me.essentials.paperlib</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.milkbowl</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.luckperms</groupId>
-            <artifactId>api</artifactId>
-            <version>5.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.papermc</groupId>
-            <artifactId>paperlib</artifactId>
-            <version>1.0.6-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>BaseProviders</artifactId>
-            <version>2.18.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>NMSReflectionProvider</artifactId>
-            <version>2.18.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>PaperProvider</artifactId>
-            <version>2.18.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.destroystokyo.paper</groupId>
-                    <artifactId>paper-api</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>1_8Provider</artifactId>
-            <version>2.18.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java

@@ -1,108 +0,0 @@
-package com.earth2me.essentials;
-
-import net.ess3.api.IEssentials;
-import org.bukkit.command.Command;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.PluginCommandYamlParser;
-import org.bukkit.plugin.Plugin;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class AlternativeCommandsHandler {
-    private static final Logger LOGGER = Logger.getLogger("Essentials");
-    private final transient Map<String, List<PluginCommand>> altcommands = new HashMap<>();
-    private final transient Map<String, String> disabledList = new HashMap<>();
-    private final transient IEssentials ess;
-
-    public AlternativeCommandsHandler(final IEssentials ess) {
-        this.ess = ess;
-        for (final Plugin plugin : ess.getServer().getPluginManager().getPlugins()) {
-            if (plugin.isEnabled()) {
-                addPlugin(plugin);
-            }
-        }
-    }
-
-    public final void addPlugin(final Plugin plugin) {
-        if (plugin.getDescription().getMain().contains("com.earth2me.essentials")) {
-            return;
-        }
-        final List<Command> commands = PluginCommandYamlParser.parse(plugin);
-        final String pluginName = plugin.getDescription().getName().toLowerCase(Locale.ENGLISH);
-
-        for (final Command command : commands) {
-            final PluginCommand pc = (PluginCommand) command;
-            final List<String> labels = new ArrayList<>(pc.getAliases());
-            labels.add(pc.getName());
-
-            PluginCommand reg = ess.getServer().getPluginCommand(pluginName + ":" + pc.getName().toLowerCase(Locale.ENGLISH));
-            if (reg == null) {
-                reg = ess.getServer().getPluginCommand(pc.getName().toLowerCase(Locale.ENGLISH));
-            }
-            if (reg == null || !reg.getPlugin().equals(plugin)) {
-                continue;
-            }
-            for (final String label : labels) {
-                final List<PluginCommand> plugincommands = altcommands.computeIfAbsent(label.toLowerCase(Locale.ENGLISH), k -> new ArrayList<>());
-                boolean found = false;
-                for (final PluginCommand pc2 : plugincommands) {
-                    if (pc2.getPlugin().equals(plugin)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    plugincommands.add(reg);
-                }
-            }
-        }
-    }
-
-    public void removePlugin(final Plugin plugin) {
-        final Iterator<Map.Entry<String, List<PluginCommand>>> iterator = altcommands.entrySet().iterator();
-        while (iterator.hasNext()) {
-            final Map.Entry<String, List<PluginCommand>> entry = iterator.next();
-            entry.getValue().removeIf(pc -> pc.getPlugin() == null || pc.getPlugin().equals(plugin));
-            if (entry.getValue().isEmpty()) {
-                iterator.remove();
-            }
-        }
-    }
-
-    public PluginCommand getAlternative(final String label) {
-        final List<PluginCommand> commands = altcommands.get(label);
-        if (commands == null || commands.isEmpty()) {
-            return null;
-        }
-        if (commands.size() == 1) {
-            return commands.get(0);
-        }
-        // return the first command that is not an alias
-        for (final PluginCommand command : commands) {
-            if (command.getName().equalsIgnoreCase(label)) {
-                return command;
-            }
-        }
-        // return the first alias
-        return commands.get(0);
-    }
-
-    public void executed(final String label, final PluginCommand pc) {
-        final String altString = pc.getPlugin().getName() + ":" + pc.getLabel();
-        if (ess.getSettings().isDebug()) {
-            LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString);
-        }
-        disabledList.put(label, altString);
-    }
-
-    public Map<String, String> disabledCommands() {
-        return disabledList;
-    }
-}

Essentials/src/main/java/com/earth2me/essentials/AlternativeCommandsHandler.java

@@ -0,0 +1,112 @@
+package com.earth2me.essentials;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.PluginIdentifiableCommand;
+import org.bukkit.plugin.Plugin;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class AlternativeCommandsHandler {
+    private static final Logger LOGGER = Logger.getLogger("Essentials");
+    private final transient Map<String, List<Command>> altcommands = new HashMap<>();
+    private final transient Map<String, String> disabledList = new HashMap<>();
+    private final transient IEssentials ess;
+
+    public AlternativeCommandsHandler(final IEssentials ess) {
+        this.ess = ess;
+        for (final Plugin plugin : ess.getServer().getPluginManager().getPlugins()) {
+            if (plugin.isEnabled()) {
+                addPlugin(plugin);
+            }
+        }
+    }
+
+    public final void addPlugin(final Plugin plugin) {
+        if (plugin.getDescription().getMain().contains("com.earth2me.essentials")) {
+            return;
+        }
+        final List<Command> commands = getPluginCommands(plugin);
+        final String pluginName = plugin.getDescription().getName().toLowerCase(Locale.ENGLISH);
+
+        for (final Command command : commands) {
+            final List<String> labels = new ArrayList<>(command.getAliases());
+            labels.add(command.getName());
+
+            for (final String label : labels) {
+                final List<Command> plugincommands = altcommands.computeIfAbsent(label.toLowerCase(Locale.ENGLISH), k -> new ArrayList<>());
+                boolean found = false;
+                for (final Command pc2 : plugincommands) {
+                    if (pc2 instanceof PluginIdentifiableCommand) {
+                        if (((PluginIdentifiableCommand) pc2).getPlugin().equals(plugin)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+                if (!found) {
+                    plugincommands.add(command);
+                }
+            }
+        }
+    }
+
+    private List<Command> getPluginCommands(Plugin plugin) {
+        final List<Command> commands = new ArrayList<>();
+        for (Command cmd : ess.getKnownCommandsProvider().getKnownCommands().values()) {
+            if (cmd instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand) cmd).getPlugin().getName().equals(plugin.getName())) {
+                commands.add(cmd);
+            }
+        }
+        return commands;
+    }
+
+    public void removePlugin(final Plugin plugin) {
+        final Iterator<Map.Entry<String, List<Command>>> iterator = altcommands.entrySet().iterator();
+        while (iterator.hasNext()) {
+            final Map.Entry<String, List<Command>> entry = iterator.next();
+            entry.getValue().removeIf(pc -> !(pc instanceof PluginIdentifiableCommand) || ((PluginIdentifiableCommand) pc).getPlugin().equals(plugin));
+            if (entry.getValue().isEmpty()) {
+                iterator.remove();
+            }
+        }
+    }
+
+    public Command getAlternative(final String label) {
+        final List<Command> commands = altcommands.get(label);
+        if (commands == null || commands.isEmpty()) {
+            return null;
+        }
+        if (commands.size() == 1) {
+            return commands.get(0);
+        }
+        // return the first command that is not an alias
+        for (final Command command : commands) {
+            if (command.getName().equalsIgnoreCase(label)) {
+                return command;
+            }
+        }
+        // return the first alias
+        return commands.get(0);
+    }
+
+    public void executed(final String label, final Command pc) {
+        if (pc instanceof PluginIdentifiableCommand) {
+            final String altString = ((PluginIdentifiableCommand) pc).getPlugin().getName() + ":" + pc.getLabel();
+            if (ess.getSettings().isDebug()) {
+                LOGGER.log(Level.INFO, "Essentials: Alternative command " + label + " found, using " + altString);
+            }
+            disabledList.put(label, altString);
+        }
+    }
+
+    public Map<String, String> disabledCommands() {
+        return disabledList;
+    }
+}

Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java

@@ -134,6 +134,13 @@ public class AsyncTeleport implements IAsyncTeleport {
         });
     }
 
+    @Override
+    public void nowUnsafe(Location loc, TeleportCause cause, CompletableFuture<Boolean> future) {
+        final CompletableFuture<Boolean> paperFuture = PaperLib.teleportAsync(teleportOwner.getBase(), loc, cause);
+        paperFuture.thenAccept(future::complete);
+        paperFuture.exceptionally(future::completeExceptionally);
+    }
+
     private void runOnMain(final Runnable runnable) throws ExecutionException, InterruptedException {
         if (Bukkit.isPrimaryThread()) {
             runnable.run();

Essentials/src/main/java/com/earth2me/essentials/Console.java

@@ -6,8 +6,11 @@ import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import static com.earth2me.essentials.I18n.tl;
+
 public final class Console implements IMessageRecipient {
     public static final String NAME = "Console";
+    public static final String DISPLAY_NAME = tl("consoleName");
     private static Console instance; // Set in essentials
 
     private final IEssentials ess;
@@ -45,7 +48,7 @@ public final class Console implements IMessageRecipient {
 
     @Override
     public String getDisplayName() {
-        return Console.NAME;
+        return Console.DISPLAY_NAME;
     }
 
     @Override

Essentials/src/main/java/com/earth2me/essentials/Essentials.java

@@ -285,7 +285,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
                 }
 
                 //Spawn Egg Providers
-                if (VersionUtil.getServerBukkitVersion().isLowerThanOrEqualTo(VersionUtil.v1_8_8_R01)) {
+                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
                     spawnEggProvider = new LegacySpawnEggProvider();
                 } else if (VersionUtil.getServerBukkitVersion().isLowerThanOrEqualTo(VersionUtil.v1_12_2_R01)) {
                     spawnEggProvider = new ReflSpawnEggProvider();
@@ -294,7 +294,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
                 }
 
                 //Potion Meta Provider
-                if (VersionUtil.getServerBukkitVersion().isLowerThanOrEqualTo(VersionUtil.v1_8_8_R01)) {
+                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
                     potionMetaProvider = new LegacyPotionMetaProvider();
                 } else {
                     potionMetaProvider = new BasePotionDataProvider();
@@ -498,10 +498,10 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
                                                 final ClassLoader classLoader, final String commandPath, final String permissionPrefix,
                                                 final IEssentialsModule module) {
         if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName()))) {
-            final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
-            if (pc != null) {
+            final Command pc = alternativeCommandsHandler.getAlternative(commandLabel);
+            if (pc instanceof PluginCommand) {
                 try {
-                    final TabCompleter completer = pc.getTabCompleter();
+                    final TabCompleter completer = ((PluginCommand) pc).getTabCompleter();
                     if (completer != null) {
                         return completer.onTabComplete(cSender, command, commandLabel, args);
                     }
@@ -574,7 +574,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
     public boolean onCommandEssentials(final CommandSender cSender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module) {
         // Allow plugins to override the command via onCommand
         if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName()))) {
-            final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
+            final Command pc = alternativeCommandsHandler.getAlternative(commandLabel);
             if (pc != null) {
                 alternativeCommandsHandler.executed(commandLabel, pc);
                 try {

Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java

@@ -680,11 +680,7 @@ public class EssentialsUpgrade {
     }
 
     private void updateBan(final String playerName, final String banReason, final Long banTimeout) {
-        if (banTimeout == 0) {
-            Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, null, Console.NAME);
-        } else {
-            Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, new Date(banTimeout), Console.NAME);
-        }
+        Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, banTimeout == 0 ? null : new Date(banTimeout), Console.NAME);
     }
 
     private void repairUserMap() {

Essentials/src/main/java/com/earth2me/essentials/PlayerList.java

@@ -40,7 +40,7 @@ public final class PlayerList {
             if (ess.getSettings().realNamesOnList() && !ChatColor.stripColor(user.getDisplayName()).equals(user.getName())) {
                 groupString.append(" (").append(user.getName()).append(")");
             }
-            groupString.append("\u00a7f");
+            groupString.append(ChatColor.WHITE.toString());
         }
         return groupString.toString();
     }

Essentials/src/main/java/com/earth2me/essentials/User.java

@@ -685,7 +685,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
 
             for (final User user : ess.getOnlineUsers()) {
                 if (user.isAuthorized("essentials.kick.notify")) {
-                    user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason));
+                    user.sendMessage(tl("playerKicked", Console.DISPLAY_NAME, getName(), kickReason));
                 }
             }
         }

Essentials/src/main/java/com/earth2me/essentials/api/IAsyncTeleport.java

@@ -34,6 +34,15 @@ public interface IAsyncTeleport {
      */
     void now(Player entity, boolean cooldown, PlayerTeleportEvent.TeleportCause cause, CompletableFuture<Boolean> future);
 
+    /**
+     * Used to skip all safety checks while teleporting a player asynchronously.
+     *
+     * @param loc    - Where should the player end up
+     * @param cause  - The reported teleportPlayer cause
+     * @param future - Future which is completed with the success status of the execution
+     */
+    void nowUnsafe(Location loc, PlayerTeleportEvent.TeleportCause cause, CompletableFuture<Boolean> future);
+
     /**
      * Teleport a player to a specific location
      *

Essentials/src/main/java/com/earth2me/essentials/api/IWarps.java

@@ -44,7 +44,7 @@ public interface IWarps extends IConf {
      * Delete a warp from the warp DB
      *
      * @param name - Name of warp
-     * @throws Exception
+     * @throws Exception If the warp could not be removed
      */
     void removeWarp(String name) throws Exception;
 
@@ -53,7 +53,7 @@ public interface IWarps extends IConf {
      *
      * @param name - Name of warp
      * @param loc  - Location of warp
-     * @throws Exception
+     * @throws Exception If the warp could not be set
      */
     void setWarp(String name, Location loc) throws Exception;
 
@@ -63,7 +63,7 @@ public interface IWarps extends IConf {
      * @param user - User of warp
      * @param name - Name of warp
      * @param loc  - Location of warp
-     * @throws Exception
+     * @throws Exception If the warp could not be set
      */
     void setWarp(IUser user, String name, Location loc) throws Exception;
 
@@ -71,14 +71,14 @@ public interface IWarps extends IConf {
      * Gets Lastowner UUID
      *
      * @param warp - Name of warp
-     * @throws WarpNotFoundException
+     * @throws WarpNotFoundException If the warp is not found
      */
     UUID getLastOwner(String warp) throws WarpNotFoundException;
 
     /**
      * Check to see if the file is empty
      *
-     * @return
+     * @return Whether or not the file is empty
      */
     boolean isEmpty();
 

Essentials/src/main/java/com/earth2me/essentials/commands/Commandban.java

@@ -41,6 +41,7 @@ public class Commandban extends EssentialsCommand {
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
         final String banReason;
         if (args.length > 1) {
             banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
@@ -50,16 +51,16 @@ public class Commandban extends EssentialsCommand {
 
         ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);
 
-        final String banDisplay = tl("banFormat", banReason, senderName);
+        final String banDisplay = tl("banFormat", banReason, senderDisplayName);
 
         user.getBase().kickPlayer(banDisplay);
-        server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay));
+        server.getLogger().log(Level.INFO, tl("playerBanned", senderDisplayName, user.getName(), banDisplay));
 
         if (nomatch) {
             sender.sendMessage(tl("userUnknown", user.getName()));
         }
 
-        ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
+        ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderDisplayName, user.getName(), banReason));
     }
 
     @Override

Essentials/src/main/java/com/earth2me/essentials/commands/Commandbanip.java

@@ -26,6 +26,7 @@ public class Commandbanip extends EssentialsCommand {
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
 
         String ipAddress;
         if (FormatUtil.validIP(args[0])) {
@@ -50,10 +51,10 @@ public class Commandbanip extends EssentialsCommand {
             banReason = tl("defaultBanReason");
         }
 
-        final String banDisplay = tl("banFormat", banReason, senderName);
+        final String banDisplay = tl("banFormat", banReason, senderDisplayName);
 
         ess.getServer().getBanList(BanList.Type.IP).addBan(ipAddress, banReason, null, senderName);
-        server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress, banReason));
+        server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderDisplayName, ipAddress, banReason));
 
         for (final Player player : ess.getServer().getOnlinePlayers()) {
             if (player.getAddress().getAddress().getHostAddress().equalsIgnoreCase(ipAddress)) {
@@ -61,7 +62,7 @@ public class Commandbanip extends EssentialsCommand {
             }
         }
 
-        ess.broadcastMessage("essentials.banip.notify", tl("playerBanIpAddress", senderName, ipAddress, banReason));
+        ess.broadcastMessage("essentials.banip.notify", tl("playerBanIpAddress", senderDisplayName, ipAddress, banReason));
     }
 
     @Override