Merge branch '1.16' of https://github.com/IntellectualSites/FastAsyncWorldEdit into fixEntities

worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandInfo.java

@@ -23,7 +23,8 @@ public class CommandInfo {
 
     private final String[] aliases;
     private final Object registeredWith;
-    private final String usage, desc;
+    private final String usage;
+    private final String desc;
     private final String[] permissions;
 
     public CommandInfo(String usage, String desc, String[] aliases, Object registeredWith) {

worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandRegistration.java

@@ -37,7 +37,8 @@ import java.util.Set;
 public class CommandRegistration {
 
     static {
-      Bukkit.getServer().getHelpMap().registerHelpTopicFactory(DynamicPluginCommand.class, new DynamicPluginCommandHelpTopic.Factory());
+        Bukkit.getServer().getHelpMap().registerHelpTopicFactory(DynamicPluginCommand.class,
+            new DynamicPluginCommandHelpTopic.Factory());
     }
 
     protected final Plugin plugin;
@@ -55,7 +56,9 @@ public class CommandRegistration {
     }
 
     public Plugin getCommandOwner(String label) {
-        if (serverCommandMap == null) return null;
+        if (serverCommandMap == null) {
+            return null;
+        }
         Command command = serverCommandMap.getCommand(label);
         if (command instanceof PluginIdentifiableCommand) {
             return ((PluginIdentifiableCommand) command).getPlugin();
@@ -87,8 +90,8 @@ public class CommandRegistration {
 
         CommandMap commandMap = ReflectionUtil.getField(plugin.getServer().getPluginManager(), "commandMap");
         if (commandMap == null) {
-            Bukkit.getServer().getLogger().severe(plugin.getDescription().getName() +
-                    ": Could not retrieve server CommandMap, using fallback instead!");
+            Bukkit.getServer().getLogger().severe(plugin.getDescription().getName()
+                + ": Could not retrieve server CommandMap, using fallback instead!");
             fallbackCommands = commandMap = new SimpleCommandMap(Bukkit.getServer());
             Bukkit.getServer().getPluginManager().registerEvents(new FallbackRegistrationListener(fallbackCommands), plugin);
         } else {

worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java

@@ -22,8 +22,6 @@ package com.sk89q.bukkit.util;
 import com.sk89q.minecraft.util.commands.CommandsManager;
 import com.sk89q.util.StringUtil;
 import com.sk89q.wepif.PermissionsResolverManager;
-import java.util.Arrays;
-import java.util.List;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -31,8 +29,11 @@ import org.bukkit.command.PluginIdentifiableCommand;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.plugin.Plugin;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
-* An implementation of a dynamically registered {@link org.bukkit.command.Command} attached to a plugin
+* An implementation of a dynamically registered {@link org.bukkit.command.Command} attached to a plugin.
 */
 @SuppressWarnings("deprecation")
 public class DynamicPluginCommand extends org.bukkit.command.Command implements PluginIdentifiableCommand {
@@ -105,7 +106,7 @@ public class DynamicPluginCommand extends org.bukkit.command.Command implements
                     }
                 }
                 return false;
-            } catch (Throwable ignore) {
+            } catch (Throwable ignored) {
             }
         } else if (PermissionsResolverManager.isInitialized() && sender instanceof OfflinePlayer) {
             for (String permission : permissions) {

worldedit-bukkit/src/main/java/com/sk89q/wepif/ConfigurationPermissionsResolver.java

@@ -31,10 +31,10 @@ import java.util.Map;
 import java.util.Set;
 
 public class ConfigurationPermissionsResolver implements PermissionsResolver {
-    private YAMLProcessor config;
-    private Map<String, Set<String>> userPermissionsCache;
-    private Set<String> defaultPermissionsCache;
-    private Map<String, Set<String>> userGroups;
+    private final YAMLProcessor config;
+    private final Map<String, Set<String>> userPermissionsCache = new HashMap<>();
+    private final Set<String> defaultPermissionsCache = new HashSet<>();
+    private final Map<String, Set<String>> userGroups = new HashMap<>();
 
     public ConfigurationPermissionsResolver(YAMLProcessor config) {
         this.config = config;
@@ -42,9 +42,10 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
 
     public static YAMLNode generateDefaultPerms(YAMLNode section) {
         section.setProperty("groups.default.permissions", new String[] {
-                "worldedit.reload",
-                "worldedit.selection",
-                "worlds.creative.worldedit.region"});
+            "worldedit.reload",
+            "worldedit.selection",
+            "worlds.creative.worldedit.region"
+        });
         section.setProperty("groups.admins.permissions", new String[] { "*" });
         section.setProperty("users.sk89q.permissions", new String[] { "worldedit" });
         section.setProperty("users.sk89q.groups", new String[] { "admins" });
@@ -53,9 +54,9 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
 
     @Override
     public void load() {
-        userGroups = new HashMap<>();
-        userPermissionsCache = new HashMap<>();
-        defaultPermissionsCache = new HashSet<>();
+        userGroups.clear();
+        userPermissionsCache.clear();
+        defaultPermissionsCache.clear();
 
         Map<String, Set<String>> userGroupPermissions = new HashMap<>();
 

worldedit-bukkit/src/main/java/com/sk89q/wepif/DinnerPermsResolver.java

@@ -78,6 +78,8 @@ public class DinnerPermsResolver implements PermissionsResolver {
                 return false;
             case 1:
                 return true;
+            default:
+                break;
         }
         int dotPos = permission.lastIndexOf(".");
         while (dotPos > -1) {
@@ -86,6 +88,8 @@ public class DinnerPermsResolver implements PermissionsResolver {
                     return false;
                 case 1:
                     return true;
+                default:
+                    break;
             }
             dotPos = permission.lastIndexOf(".", dotPos - 1);
         }
@@ -126,19 +130,23 @@ public class DinnerPermsResolver implements PermissionsResolver {
     }
 
     public Permissible getPermissible(OfflinePlayer offline) {
-        if (offline == null) return null;
+        if (offline == null) {
+            return null;
+        }
         Permissible perm = null;
         if (offline instanceof Permissible) {
             perm = (Permissible) offline;
         } else {
             Player player = offline.getPlayer();
-            if (player != null) perm = player;
+            if (player != null) {
+                perm = player;
+            }
         }
         return perm;
     }
 
     /**
-     * Checks the permission from dinnerperms
+     * Checks the permission from dinnerperms.
      *
      * @param perms      Permissible to check for
      * @param permission The permission to check

worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java

@@ -35,8 +35,8 @@ public class NijiPermissionsResolver implements PermissionsResolver {
 
     private static final Logger log = LoggerFactory.getLogger(NijiPermissionsResolver.class);
 
-    private Server server;
-    private Permissions api;
+    private final Server server;
+    private final Permissions api;
 
     public static PermissionsResolver factory(Server server, YAMLProcessor config) {
         PluginManager pluginManager = server.getPluginManager();
@@ -76,7 +76,9 @@ public class NijiPermissionsResolver implements PermissionsResolver {
     public boolean hasPermission(String name, String permission) {
         try {
             Player player = server.getPlayerExact(name);
-            if (player == null) return false;
+            if (player == null) {
+                return false;
+            }
             try {
                 return api.getHandler().has(player, permission);
             } catch (Throwable t) {
@@ -107,7 +109,9 @@ public class NijiPermissionsResolver implements PermissionsResolver {
     public boolean inGroup(String name, String group) {
         try {
             Player player = server.getPlayerExact(name);
-            if (player == null) return false;
+            if (player == null) {
+                return false;
+            }
             try {
                 return api.getHandler().inGroup(player.getWorld().getName(), name, group);
             } catch (Throwable t) {
@@ -124,13 +128,17 @@ public class NijiPermissionsResolver implements PermissionsResolver {
     public String[] getGroups(String name) {
         try {
             Player player = server.getPlayerExact(name);
-            if (player == null) return new String[0];
+            if (player == null) {
+                return new String[0];
+            }
             String[] groups = null;
             try {
                 groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName());
             } catch (Throwable t) {
                 String group = api.Security.getGroup(player.getWorld().getName(), player.getName());
-                if (group != null) groups = new String[] { group };
+                if (group != null) {
+                    groups = new String[] { group };
+                }
             }
             if (groups == null) {
                 return new String[0];

worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java

@@ -40,24 +40,24 @@ import java.util.List;
 
 public class PermissionsResolverManager implements PermissionsResolver {
 
-    private static final String CONFIG_HEADER = "#\r\n" +
-            "# WEPIF Configuration File\r\n" +
-            "#\r\n" +
-            "# This file handles permissions configuration for every plugin using WEPIF\r\n" +
-            "#\r\n" +
-            "# About editing this file:\r\n" +
-            "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
-            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
-            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
-            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
-            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
-            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
-            "#   category.\r\n" +
-            "# - If you want to check the format of this file before putting it\r\n" +
-            "#   into WEPIF, paste it into http://yaml-online-parser.appspot.com/\r\n" +
-            "#   and see if it gives \"ERROR:\".\r\n" +
-            "# - Lines starting with # are comments and so they are ignored.\r\n" +
-            "\r\n";
+    private static final String CONFIG_HEADER = "#\r\n"
+        + "# WEPIF Configuration File\r\n"
+        + "#\r\n"
+        + "# This file handles permissions configuration for every plugin using WEPIF\r\n"
+        + "#\r\n"
+        + "# About editing this file:\r\n"
+        + "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n"
+        + "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n"
+        + "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n"
+        + "#   be changed in Settings > Preferences > Language Menu.\r\n"
+        + "# - Don't get rid of the indents. They are indented so some entries are\r\n"
+        + "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n"
+        + "#   category.\r\n"
+        + "# - If you want to check the format of this file before putting it\r\n"
+        + "#   into WEPIF, paste it into https://yaml-online-parser.appspot.com/\r\n"
+        + "#   and see if it gives \"ERROR:\".\r\n"
+        + "# - Lines starting with # are comments and so they are ignored.\r\n"
+        + "\r\n";
 
     private static PermissionsResolverManager instance;
 
@@ -78,22 +78,22 @@ public class PermissionsResolverManager implements PermissionsResolver {
         return instance;
     }
 
-    private Server server;
+    private final Server server;
     private PermissionsResolver permissionResolver;
     private YAMLProcessor config;
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    private List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<>();
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+    private final List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<>();
 
     @SuppressWarnings("unchecked")
     protected Class<? extends PermissionsResolver>[] availableResolvers = new Class[] {
-            PluginPermissionsResolver.class,
-            PermissionsExResolver.class,
-            bPermissionsResolver.class,
-            GroupManagerResolver.class,
-            NijiPermissionsResolver.class,
-            VaultResolver.class,
-            DinnerPermsResolver.class,
-            FlatFilePermissionsResolver.class
+        PluginPermissionsResolver.class,
+        PermissionsExResolver.class,
+        bPermissionsResolver.class,
+        GroupManagerResolver.class,
+        NijiPermissionsResolver.class,
+        VaultResolver.class,
+        DinnerPermsResolver.class,
+        FlatFilePermissionsResolver.class
     };
 
     protected PermissionsResolverManager(Plugin plugin) {
@@ -225,7 +225,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
                 Class<?> next = null;
                 try {
                     next = Class.forName(getClass().getPackage().getName() + "." + nextName);
-                } catch (ClassNotFoundException e) {}
+                } catch (ClassNotFoundException ignored) {
+                }
 
                 if (next == null || !PermissionsResolver.class.isAssignableFrom(next)) {
                     logger.warn("WEPIF: Invalid or unknown class found in enabled resolvers: "
@@ -239,12 +240,12 @@ public class PermissionsResolverManager implements PermissionsResolver {
             }
 
             for (Class<?> clazz : availableResolvers) {
-                if (!stagedEnabled.contains(clazz.getSimpleName()) &&
-                        !disabledResolvers.contains(clazz.getSimpleName())) {
+                if (!stagedEnabled.contains(clazz.getSimpleName())
+                    && !disabledResolvers.contains(clazz.getSimpleName())) {
                     disabledResolvers.add(clazz.getSimpleName());
                     logger.info("New permissions resolver: "
-                            + clazz.getSimpleName() + " detected. " +
-                            "Added to disabled resolvers list.");
+                        + clazz.getSimpleName() + " detected. "
+                        + "Added to disabled resolvers list.");
                     isUpdated = true;
                 }
             }

worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java

@@ -37,7 +37,7 @@ public class bPermissionsResolver implements PermissionsResolver {
 
         return new bPermissionsResolver(server);
     }
-    
+
     private final Server server;
 
     public bPermissionsResolver(Server server) {

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java

@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 
 /**
- * YAMLConfiguration but with setting for no op permissions and plugin root data folder
+ * YAMLConfiguration but with setting for no op permissions and plugin root data folder.
  */
 public class BukkitConfiguration extends YAMLConfiguration {
 
@@ -59,8 +59,8 @@ public class BukkitConfiguration extends YAMLConfiguration {
         File toDir = new File(getWorkingDirectory(), file);
         if (fromDir.exists() & !toDir.exists()) {
             if (fromDir.renameTo(toDir)) {
-                plugin.getLogger().info("Migrated " + name + " folder '" + file +
-                        "' from server root to plugin data folder.");
+                plugin.getLogger().info("Migrated " + name + " folder '" + file
+                    + "' from server root to plugin data folder.");
             } else {
                 plugin.getLogger().warning("Error while migrating " + name + " folder!");
             }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java

@@ -19,9 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.boydti.fawe.util.TaskManager;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
@@ -35,9 +32,10 @@ import org.bukkit.entity.EntityType;
 
 import java.lang.ref.WeakReference;
 import java.util.Locale;
-
 import javax.annotation.Nullable;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * An adapter to adapt a Bukkit entity into a WorldEdit one.
  */

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@@ -194,7 +194,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
     }
 
     @Override
-    public void setPosition(Vector3 pos, float pitch, float yaw) {
+    public boolean trySetPosition(Vector3 pos, float pitch, float yaw) {
         org.bukkit.World world = player.getWorld();
         if (pos instanceof com.sk89q.worldedit.util.Location) {
             com.sk89q.worldedit.util.Location loc = (com.sk89q.worldedit.util.Location) pos;
@@ -203,7 +203,8 @@ public class BukkitPlayer extends AbstractPlayerActor {
                 world = Bukkit.getWorld(((World) extent).getName());
             }
         }
-        player.teleport(new Location(world, pos.getX(), pos.getY(), pos.getZ(), yaw, pitch));
+        org.bukkit.World finalWorld = world;
+        return TaskManager.IMP.sync(() -> player.teleport(new Location(finalWorld, pos.getX(), pos.getY(), pos.getZ(), yaw, pitch)));
     }
 
     @Override

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_14_R4.java

@@ -406,10 +406,11 @@ public final class FAWE_Spigot_v1_14_R4 extends CachedBukkitAdapter implements I
                     SingleThreadQueueExtent extent = new SingleThreadQueueExtent();
                     extent.init(null, (x, z) -> new BukkitGetBlocks_1_14(freshWorld, x, z) {
                         @Override
-                        public Chunk ensureLoaded(World nmsWorld, int X, int Z) {
-                            Chunk cached = nmsWorld.getChunkIfLoaded(X, Z);
+                        public Chunk ensureLoaded(World nmsWorld, int chunkX, int chunkZ) {
+                            Chunk cached = nmsWorld.getChunkIfLoaded(chunkX, chunkZ);
                             if (cached != null) return cached;
-                            Future<Chunk> future = Fawe.get().getQueueHandler().sync((Supplier<Chunk>) () -> freshWorld.getChunkAt(X, Z));
+                            Future<Chunk> future = Fawe.get().getQueueHandler().sync((Supplier<Chunk>) () -> freshWorld.getChunkAt(
+                                chunkX, chunkZ));
                             while (!future.isDone()) {
                                 // this feels so dirty
                                 freshWorld.getChunkProvider().runTasks();