diff --git a/src/main/java/com/sk89q/worldguard/LocalPlayer.java b/src/main/java/com/sk89q/worldguard/LocalPlayer.java index 37590399..ce89e0e7 100644 --- a/src/main/java/com/sk89q/worldguard/LocalPlayer.java +++ b/src/main/java/com/sk89q/worldguard/LocalPlayer.java @@ -82,11 +82,9 @@ public abstract class LocalPlayer { @Override public boolean equals(Object obj) { - if (!(obj instanceof LocalPlayer)) { - return false; - } - - return ((LocalPlayer)obj).getName().equals(getName()); + + return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName()); + } @Override diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java index b6905c92..18e4ac82 100644 --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java @@ -19,6 +19,7 @@ package com.sk89q.worldguard.blacklist; +import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -105,9 +106,7 @@ public void setIgnoreGroups(String[] ignoreGroups) { */ public void setIgnorePermissions(String[] ignorePermissions) { Set ignorePermissionsSet = new HashSet(); - for (String perm : ignorePermissions) { - ignorePermissionsSet.add(perm); - } + Collections.addAll(ignorePermissionsSet, ignorePermissions); this.ignorePermissions = ignorePermissionsSet; } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java index 98ab4286..b0606525 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java @@ -19,29 +19,20 @@ package com.sk89q.worldguard.bukkit; -import java.util.List; - +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.blocks.BlockID; +import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.blocks.ItemID; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.block.Block; -import org.bukkit.entity.Entity; -import org.bukkit.entity.ExperienceOrb; -import org.bukkit.entity.Item; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.entity.Tameable; -import org.bukkit.entity.FallingSand; - +import org.bukkit.entity.*; import org.bukkit.inventory.ItemStack; -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.Vector; -import com.sk89q.worldedit.blocks.BlockType; +import java.util.List; public class BukkitUtil { @@ -149,11 +140,7 @@ public static void setBlockToWater(World world, int ox, int oy, int oz) { public static boolean isBlockWater(World world, int ox, int oy, int oz) { Block block = world.getBlockAt(ox, oy, oz); int id = block.getTypeId(); - if (id == 8 || id == 9) { - return true; - } else { - return false; - } + return id == 8 || id == 9; } /** @@ -264,7 +251,7 @@ public static boolean hasHangingEvent() { Class tmp = null; try { tmp = Class.forName("org.bukkit.event.hanging.HangingEvent"); - } catch (ClassNotFoundException ex) { } + } catch (ClassNotFoundException ignored) { } return (tmp != null); } } diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java index e812b088..f22e2457 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java @@ -19,21 +19,6 @@ package com.sk89q.worldguard.bukkit; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; - -import org.bukkit.block.Block; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; - import com.sk89q.util.yaml.YAMLFormat; import com.sk89q.util.yaml.YAMLProcessor; import com.sk89q.worldguard.blacklist.Blacklist; @@ -43,6 +28,15 @@ import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler; import com.sk89q.worldguard.chest.ChestProtection; import com.sk89q.worldguard.chest.SignChestProtection; +import org.bukkit.block.Block; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.*; +import java.util.logging.Level; /** * Holds the configuration for individual worlds. @@ -513,10 +507,8 @@ public boolean isChestProtected(Block block, Player player) { } public boolean isChestProtected(Block block) { - if (!signChestProtection) { - return false; - } - return chestProtection.isProtected(block, null); + + return signChestProtection && chestProtection.isProtected(block, null); } public boolean isChestProtectedPlacement(Block block, Player player) { diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java index 36f56241..dce514d9 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java @@ -19,23 +19,7 @@ package com.sk89q.worldguard.bukkit.commands; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.bukkit.ChatColor; -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissions; -import com.sk89q.minecraft.util.commands.CommandPermissionsException; +import com.sk89q.minecraft.util.commands.*; import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.Location; import com.sk89q.worldedit.Vector; @@ -49,22 +33,25 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.domains.DefaultDomain; import com.sk89q.worldguard.protection.ApplicableRegionSet; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.flags.InvalidFlagFormat; -import com.sk89q.worldguard.protection.flags.RegionGroup; -import com.sk89q.worldguard.protection.flags.RegionGroupFlag; +import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; +import com.sk89q.worldguard.protection.databases.RegionDBUtil; +import com.sk89q.worldguard.protection.databases.migrators.AbstractDatabaseMigrator; +import com.sk89q.worldguard.protection.databases.migrators.MigrationException; +import com.sk89q.worldguard.protection.databases.migrators.MigratorKey; +import com.sk89q.worldguard.protection.flags.*; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException; -import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; -import com.sk89q.worldguard.protection.databases.migrators.AbstractDatabaseMigrator; -import com.sk89q.worldguard.protection.databases.migrators.MigrationException; -import com.sk89q.worldguard.protection.databases.migrators.MigratorKey; -import com.sk89q.worldguard.protection.databases.RegionDBUtil; +import org.bukkit.ChatColor; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import java.lang.reflect.InvocationTargetException; +import java.util.*; public class RegionCommands { private final WorldGuardPlugin plugin; @@ -507,9 +494,9 @@ public void displayRegionInfo(CommandSender sender, final LocalPlayer localPlaye } if(group == null) { - s.append(flag.getName() + ": " + String.valueOf(val)); + s.append(flag.getName()).append(": ").append(String.valueOf(val)); } else { - s.append(flag.getName() + " -g " + String.valueOf(group) + ": " + String.valueOf(val)); + s.append(flag.getName()).append(" -g ").append(String.valueOf(group)).append(": ").append(String.valueOf(val)); } hasFlags = true; diff --git a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java index d34fc282..482f74fe 100644 --- a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java +++ b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java @@ -115,10 +115,7 @@ private Boolean isProtectedSignAndChest(Block block, Player player) { private boolean isProtectedSignAndChestBinary(Block block, Player player) { Boolean res = isProtectedSignAndChest(block, player); - if (res == null || !res) { - return false; - } - return true; + return !(res == null || !res); } public boolean isAdjacentChestProtected(Block searchBlock, Player player) { diff --git a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java b/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java index 76b7f6cd..21e6c11b 100644 --- a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java +++ b/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java @@ -18,23 +18,13 @@ */ package com.sk89q.worldguard.protection; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; - import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.flags.RegionGroup; -import com.sk89q.worldguard.protection.flags.RegionGroupFlag; -import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.flags.*; import com.sk89q.worldguard.protection.flags.StateFlag.State; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import java.util.*; + /** * Represents a set of regions for a particular point or area and the rules * that are represented by that set. An instance of this can be used to @@ -216,16 +206,12 @@ private boolean internalGetState(StateFlag flag, LocalPlayer player, Set needsClear = new HashSet(); Set hasCleared = new HashSet(); - Iterator it = applicable.iterator(); - - while (it.hasNext()) { - ProtectedRegion region = it.next(); - + for (ProtectedRegion region : applicable) { // Ignore lower priority regions if (hasFlagDefined && region.getPriority() < lastPriority) { break; } - + lastPriority = region.getPriority(); // Ignore non-build regions @@ -244,7 +230,7 @@ private boolean internalGetState(StateFlag flag, LocalPlayer player, continue; } } - + State v = region.getFlag(flag); // Allow DENY to override everything @@ -337,11 +323,7 @@ public , V> V getFlag(T flag, LocalPlayer groupPlayer) { Map needsClear = new HashMap(); Set hasCleared = new HashSet(); - Iterator it = applicable.iterator(); - - while (it.hasNext()) { - ProtectedRegion region = it.next(); - + for (ProtectedRegion region : applicable) { // Ignore lower priority regions if (found && region.getPriority() < lastPriority) { break; @@ -360,11 +342,11 @@ public , V> V getFlag(T flag, LocalPlayer groupPlayer) { if (hasCleared.contains(region)) { // Already cleared, so do nothing - } else if (region.getFlag(flag) != null){ + } else if (region.getFlag(flag) != null) { clearParents(needsClear, hasCleared, region); - + needsClear.put(region, region.getFlag(flag)); - + found = true; } diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java index 877cd531..4329c525 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java @@ -182,7 +182,7 @@ public void load() throws ProtectionDatabaseException { } finally { try { reader.close(); - } catch (IOException e) { + } catch (IOException ignored) { } } diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java index bc2af2a3..57cd1451 100755 --- a/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/MySQLDatabase.java @@ -20,26 +20,6 @@ package com.sk89q.worldguard.protection.databases; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.DumperOptions.FlowStyle; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.SafeConstructor; -import org.yaml.snakeyaml.error.YAMLException; -import org.yaml.snakeyaml.representer.Representer; - import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector2D; import com.sk89q.worldedit.Vector; @@ -52,6 +32,17 @@ import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.DumperOptions.FlowStyle; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.constructor.SafeConstructor; +import org.yaml.snakeyaml.error.YAMLException; +import org.yaml.snakeyaml.representer.Representer; + +import java.sql.*; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; public class MySQLDatabase extends AbstractProtectionDatabase { private final Logger logger; @@ -68,12 +59,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase { private final ConfigurationManager config; private Connection conn; - private String world; private int worldDbId = -1; // The database will never have an id of -1; public MySQLDatabase(ConfigurationManager config, String world, Logger logger) throws ProtectionDatabaseException { this.config = config; - this.world = world; + String world1 = world; this.logger = logger; try { @@ -97,7 +87,7 @@ public MySQLDatabase(ConfigurationManager config, String world, Logger logger) t "WHERE `name` = ? LIMIT 0,1" ); - worldStmt.setString(1, this.world); + worldStmt.setString(1, world1); ResultSet worldResult = worldStmt.executeQuery(); if (worldResult.first()) { @@ -551,15 +541,15 @@ private Map getUserIds(String... usernames) { Statement.RETURN_GENERATED_KEYS ); - for(int i=0, len=usernames.length; i getGroupIds(String... groupnames) { Statement.RETURN_GENERATED_KEYS ); - for(int i=0, len=groupnames.length; i players = getUserIds(domain.getPlayers().toArray(new String[0])); + Set var = domain.getPlayers(); - for (Integer player : players.values()) { + for (Integer player : getUserIds(var.toArray(new String[var.size()])).values()) { insertUsersForRegion.setString(1, region.getId().toLowerCase()); insertUsersForRegion.setInt(2, player); insertUsersForRegion.setBoolean(3, owners); @@ -831,9 +821,8 @@ private void updatePlayerAndGroups(ProtectedRegion region, Boolean owners) throw "VALUES (?, " + this.worldDbId + ", ?, ?)" ); - Map groups = getGroupIds(domain.getGroups().toArray(new String[0])); - - for (Integer group : groups.values()) { + Set groupVar = domain.getGroups(); + for (Integer group : getGroupIds(groupVar.toArray(new String[groupVar.size()])).values()) { insertGroupsForRegion.setString(1, region.getId().toLowerCase()); insertGroupsForRegion.setInt(2, group); insertGroupsForRegion.setBoolean(3, owners); diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java index 5ac22f96..62e92f59 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java @@ -19,6 +19,14 @@ package com.sk89q.worldguard.protection.databases.migrators; +import com.sk89q.worldguard.bukkit.ConfigurationManager; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import com.sk89q.worldguard.protection.databases.MySQLDatabase; +import com.sk89q.worldguard.protection.databases.ProtectionDatabase; +import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; +import com.sk89q.worldguard.protection.databases.YAMLDatabase; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; + import java.io.File; import java.io.FileNotFoundException; import java.sql.Connection; @@ -29,14 +37,6 @@ import java.util.Map; import java.util.Set; -import com.sk89q.worldguard.bukkit.ConfigurationManager; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.protection.databases.MySQLDatabase; -import com.sk89q.worldguard.protection.databases.ProtectionDatabase; -import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException; -import com.sk89q.worldguard.protection.databases.YAMLDatabase; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; - public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator { private WorldGuardPlugin plugin; @@ -59,7 +59,7 @@ public MySQLToYAMLMigrator(WorldGuardPlugin plugin) throws MigrationException { conn.close(); } catch (SQLException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } } @@ -75,7 +75,7 @@ protected Map getRegionsForWorldFromOld(String world) t oldDatabase = new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger()); oldDatabase.load(); } catch (ProtectionDatabaseException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } return oldDatabase.getRegions(); @@ -89,9 +89,9 @@ protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationEx return new YAMLDatabase(file, plugin.getLogger()); } catch (FileNotFoundException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } catch (ProtectionDatabaseException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } } } diff --git a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java index 403a0e79..7c188735 100644 --- a/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java @@ -19,12 +19,6 @@ package com.sk89q.worldguard.protection.databases.migrators; -import java.io.File; -import java.io.FileNotFoundException; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.databases.MySQLDatabase; import com.sk89q.worldguard.protection.databases.ProtectionDatabase; @@ -32,6 +26,12 @@ import com.sk89q.worldguard.protection.databases.YAMLDatabase; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import java.io.File; +import java.io.FileNotFoundException; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + public class YAMLToMySQLMigrator extends AbstractDatabaseMigrator { private WorldGuardPlugin plugin; @@ -66,9 +66,9 @@ protected Map getRegionsForWorldFromOld(String world) t oldDatabase = new YAMLDatabase(this.regionYamlFiles.get(world), plugin.getLogger()); oldDatabase.load(); } catch (FileNotFoundException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } catch (ProtectionDatabaseException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } return oldDatabase.getRegions(); @@ -79,7 +79,7 @@ protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationEx try { return new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger()); } catch (ProtectionDatabaseException e) { - throw new MigrationException((Exception) e); + throw new MigrationException(e); } } diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java index 5cc86183..fa42881d 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java @@ -82,7 +82,7 @@ public Location parseInput(WorldGuardPlugin plugin, CommandSender sender, String ), yaw, pitch ); - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { } } diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java index 210fdcd3..f9aa656c 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java @@ -61,7 +61,7 @@ public Vector parseInput(WorldGuardPlugin plugin, CommandSender sender, String i Double.parseDouble(split[1]), Double.parseDouble(split[2]) ); - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { } } diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java index 3c3a98ed..9b70f68c 100644 --- a/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java +++ b/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java @@ -18,13 +18,6 @@ */ package com.sk89q.worldguard.protection.managers; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.TreeSet; - import com.sk89q.worldedit.Vector; import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.protection.ApplicableRegionSet; @@ -32,6 +25,8 @@ import com.sk89q.worldguard.protection.databases.ProtectionDatabase; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import java.util.*; + /** * A very simple implementation of the region manager that uses a flat list * and iterates through the list to identify applicable regions. This method @@ -78,9 +73,7 @@ public void removeRegion(String id) { if (region != null) { List removeRegions = new ArrayList(); - Iterator iter = regions.values().iterator(); - while (iter.hasNext()) { - ProtectedRegion curRegion = iter.next(); + for (ProtectedRegion curRegion : regions.values()) { if (curRegion.getParent() == region) { removeRegions.add(curRegion.getId().toLowerCase()); } diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java index d45fafb0..222382b9 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java +++ b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java @@ -19,12 +19,6 @@ package com.sk89q.worldguard.protection.regions; -import java.awt.geom.Line2D; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector2D; import com.sk89q.worldedit.Vector; @@ -33,6 +27,12 @@ import com.sk89q.worldguard.protection.UnsupportedIntersectionException; import com.sk89q.worldguard.protection.flags.Flag; +import java.awt.geom.Line2D; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + /** * Represents a region of any shape and size that can be protected. * @@ -541,25 +541,25 @@ protected boolean intersectsEdges(ProtectedRegion region) { List pts2 = region.getPoints(); BlockVector2D lastPt1 = pts1.get(pts1.size() - 1); BlockVector2D lastPt2 = pts2.get(pts2.size() - 1); - for (int i = 0; i < pts1.size(); i++ ) { - for (int j = 0; j < pts2.size(); j++) { + for (BlockVector2D aPts1 : pts1) { + for (BlockVector2D aPts2 : pts2) { Line2D line1 = new Line2D.Double( lastPt1.getBlockX(), lastPt1.getBlockZ(), - pts1.get(i).getBlockX(), - pts1.get(i).getBlockZ()); + aPts1.getBlockX(), + aPts1.getBlockZ()); if (line1.intersectsLine( - lastPt2.getBlockX(), - lastPt2.getBlockZ(), - pts2.get(j).getBlockX(), - pts2.get(j).getBlockZ())) { + lastPt2.getBlockX(), + lastPt2.getBlockZ(), + aPts2.getBlockX(), + aPts2.getBlockZ())) { return true; } - lastPt2 = pts2.get(j); + lastPt2 = aPts2; } - lastPt1 = pts1.get(i); + lastPt1 = aPts1; } return false; } diff --git a/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java index 694f217d..810ad1e6 100644 --- a/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java +++ b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java @@ -84,7 +84,7 @@ public void run() { in = conn.getInputStream(); BufferedReader reader = new BufferedReader(new InputStreamReader(in)); String line; - StringBuffer response = new StringBuffer(); + StringBuilder response = new StringBuilder(); while ((line = reader.readLine()) != null) { response.append(line); response.append("\r\n"); @@ -114,13 +114,13 @@ public void run() { if (in != null) { try { in.close(); - } catch (IOException e) { + } catch (IOException ignored) { } } if (out != null) { try { out.close(); - } catch (IOException e) { + } catch (IOException ignored) { } } }