From 8f3d35bca38d3ebc4b7fd7c0cad79e7f2b4b7aa1 Mon Sep 17 00:00:00 2001 From: MattBDev Date: Thu, 28 Apr 2016 16:38:51 -0400 Subject: [PATCH] Bug Fix and Cleanup --- .../com/plotsquared/bukkit/BukkitMain.java | 9 +- .../bukkit/chat/TextualComponent.java | 4 +- .../database/plotme/LikePlotMeConverter.java | 6 +- .../bukkit/listeners/PlayerEvents.java | 191 ++--- .../bukkit/listeners/PlayerEvents_1_9.java | 3 - .../listeners/worldedit/WEListener.java | 9 +- .../bukkit/titles/DefaultTitleManager.java | 4 +- .../bukkit/titles/HackTitleManager.java | 2 +- .../bukkit/util/BukkitChunkManager.java | 205 ++--- .../plotsquared/bukkit/util/BukkitUtil.java | 10 +- .../com/plotsquared/bukkit/util/Metrics.java | 5 - .../bukkit/util/block/FastQueue_1_9.java | 4 +- .../bukkit/uuid/FileUUIDHandler.java | 6 +- .../configuration/file/YamlConfiguration.java | 5 +- .../ConfigurationSerialization.java | 9 +- .../jnbt/ByteArrayTag.java | 2 +- .../intellectualcrafters/jnbt/ByteTag.java | 2 +- .../jnbt/CompoundTag.java | 2 +- .../jnbt/CompoundTagBuilder.java | 2 +- .../intellectualcrafters/jnbt/DoubleTag.java | 2 +- .../intellectualcrafters/jnbt/FloatTag.java | 2 +- .../jnbt/IntArrayTag.java | 2 +- .../com/intellectualcrafters/jnbt/IntTag.java | 2 +- .../intellectualcrafters/jnbt/ListTag.java | 2 +- .../jnbt/ListTagBuilder.java | 2 +- .../intellectualcrafters/jnbt/LongTag.java | 2 +- .../intellectualcrafters/jnbt/ShortTag.java | 2 +- .../intellectualcrafters/jnbt/StringTag.java | 2 +- .../intellectualcrafters/json/JSONObject.java | 2 +- .../intellectualcrafters/json/JSONString.java | 2 +- .../json/JSONTokener.java | 4 +- .../com/intellectualcrafters/plot/PS.java | 13 +- .../plot/commands/Area.java | 24 +- .../plot/commands/Auto.java | 2 +- .../plot/commands/DebugClaimTest.java | 2 +- .../plot/commands/FlagCmd.java | 5 - .../plot/commands/GenerateDocs.java | 19 +- .../plot/commands/ListCmd.java | 6 +- .../plot/commands/Merge.java | 13 +- .../plot/commands/RegenAllRoads.java | 2 +- .../plot/commands/Setup.java | 24 +- .../plot/commands/Update.java | 2 +- .../intellectualcrafters/plot/config/C.java | 9 +- .../plot/config/Configuration.java | 16 +- .../plot/database/SQLManager.java | 805 +++++++++--------- .../plot/database/SQLite.java | 2 +- .../plot/database/StmtMod.java | 6 +- .../intellectualcrafters/plot/flag/Flag.java | 2 +- .../plot/generator/AugmentedUtils.java | 3 +- .../plot/object/Plot.java | 36 +- .../plot/object/PlotAnalysis.java | 2 +- .../plot/object/PlotHandler.java | 4 +- .../plot/object/PlotPlayer.java | 13 - .../plot/util/BO3Handler.java | 2 +- .../plot/util/MainUtil.java | 18 +- .../plot/util/MathMan.java | 2 +- .../plot/util/ReflectionUtils.java | 32 +- .../plot/util/SchematicHandler.java | 2 + .../plotsquared/general/commands/Command.java | 2 +- .../general/commands/CommandCaller.java | 6 + .../plotsquared/listener/WESubscriber.java | 3 +- .../intellectualcrafters/plot/FlagTest.java | 4 +- .../plot/database/AbstractDBTEst.java | 54 +- .../plot/util/EventUtilTest.java | 6 - .../sponge/listener/MainListener.java | 8 +- .../sponge/util/SpongeTitleManager.java | 1 - .../sponge/util/block/SlowQueue.java | 1 - .../sponge/uuid/SpongeOnlineUUIDWrapper.java | 3 +- 68 files changed, 780 insertions(+), 880 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index 9f7f03251..03b667983 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -620,11 +620,14 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain public PlotPlayer wrapPlayer(Object player) { if (player instanceof Player) { return BukkitUtil.getPlayer((Player) player); - } else if (player instanceof OfflinePlayer) { + } + if (player instanceof OfflinePlayer) { return BukkitUtil.getPlayer((OfflinePlayer) player); - } else if (player instanceof String) { + } + if (player instanceof String) { return UUIDHandler.getPlayer((String) player); - } else if (player instanceof UUID) { + } + if (player instanceof UUID) { return UUIDHandler.getPlayer((UUID) player); } return null; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java index ad90d4b7b..08a62255e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java @@ -192,7 +192,7 @@ public abstract class TextualComponent implements Cloneable { } @Override - public TextualComponent clone() throws CloneNotSupportedException { + public TextualComponent clone() { // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone return new ArbitraryTextTypeComponent(getKey(), getValue()); } @@ -266,7 +266,7 @@ public abstract class TextualComponent implements Cloneable { } @Override - public TextualComponent clone() throws CloneNotSupportedException { + public TextualComponent clone() { // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone return new ComplexTextTypeComponent(getKey(), getValue()); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java index 1973e8b7f..205cd6eec 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java @@ -264,7 +264,7 @@ public class LikePlotMeConverter { sendMessage("Saving configuration..."); try { PS.get().config.save(PS.get().configFile); - } catch (IOException e) { + } catch (IOException ignored) { sendMessage(" - &cFailed to save configuration."); } TaskManager.runTask(new Runnable() { @@ -293,7 +293,7 @@ public class LikePlotMeConverter { Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName); try { Thread.sleep(1000); - } catch (InterruptedException ex) { + } catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } // load world with MV @@ -304,7 +304,7 @@ public class LikePlotMeConverter { Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + actualWorldName); try { Thread.sleep(1000); - } catch (InterruptedException ex) { + } catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } // load world with MW diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index ac1154369..8fc9572f5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -196,8 +196,9 @@ public class PlayerEvents extends PlotListener implements Listener { if (plot == null) { return; } - if (plot.getFlag(Flags.REDSTONE).isPresent()) { - if (plot.getFlag(Flags.REDSTONE).get()) { + Optional flag = plot.getFlag(Flags.REDSTONE); + if (flag.isPresent()) { + if (flag.get()) { return; } else { event.setNewCurrent(0); @@ -245,7 +246,8 @@ public class PlayerEvents extends PlotListener implements Listener { if (plot == null) { return; } - if (plot.getFlag(Flags.REDSTONE).isPresent() && !plot.getFlag(Flags.REDSTONE).get()) { + Optional flag = plot.getFlag(Flags.REDSTONE); + if (flag.isPresent() && !flag.get()) { event.setCancelled(true); } return; @@ -322,7 +324,8 @@ public class PlayerEvents extends PlotListener implements Listener { } entity.remove(); return false; - } else if (!(shooter instanceof Entity) && shooter != null) { + } + if (!(shooter instanceof Entity) && shooter != null) { if (plot == null) { entity.remove(); return false; @@ -374,7 +377,7 @@ public class PlayerEvents extends PlotListener implements Listener { String c = parts[0]; if (parts[0].contains(":")) { c = parts[0].split(":")[1]; - msg = msg.replace(parts[0].split(":")[0] + ":", ""); + msg = msg.replace(parts[0].split(":")[0] + ':', ""); } String l = c; List aliases = new ArrayList<>(); @@ -513,7 +516,8 @@ public class PlayerEvents extends PlotListener implements Listener { player.teleport(event.getTo()); MainUtil.sendMessage(pp, C.BORDER); return; - } else if (x2 < -border) { + } + if (x2 < -border) { to.setX(-border + 4); player.teleport(event.getTo()); MainUtil.sendMessage(pp, C.BORDER); @@ -633,7 +637,8 @@ public class PlayerEvents extends PlotListener implements Listener { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED); event.setCancelled(true); return; - } else if (!plot.isAdded(pp.getUUID())) { + } + if (!plot.isAdded(pp.getUUID())) { Optional> destroy = plot.getFlag(Flags.BREAK); Block block = event.getBlock(); if (destroy.isPresent() && destroy.get() @@ -686,7 +691,8 @@ public class PlayerEvents extends PlotListener implements Listener { } Plot plot = area.getOwnedPlot(location); if (plot != null) { - if (plot.getFlag(Flags.EXPLOSION).isPresent() && plot.getFlag(Flags.EXPLOSION).get()) { + Optional flag = plot.getFlag(Flags.EXPLOSION); + if (flag.isPresent() && flag.get()) { List meta = event.getEntity().getMetadata("plot"); Plot origin; if (meta.isEmpty()) { @@ -780,19 +786,23 @@ public class PlayerEvents extends PlotListener implements Listener { return; } Plot plot = area.getOwnedPlot(location); + Optional flag; switch (block.getType()) { case GRASS: - if (plot.getFlag(Flags.GRASS_GROW).isPresent() && plot.getFlag(Flags.GRASS_GROW).get()) { + flag = plot.getFlag(Flags.GRASS_GROW); + if (flag.isPresent() && flag.get()) { event.setCancelled(true); } break; case MYCEL: - if (plot.getFlag(Flags.MYCEL_GROW).isPresent() && plot.getFlag(Flags.MYCEL_GROW).get()) { + flag = plot.getFlag(Flags.MYCEL_GROW); + if (flag.isPresent() && flag.get()) { event.setCancelled(true); } break; case VINE: - if (plot.getFlag(Flags.VINE_GROW).isPresent() && plot.getFlag(Flags.VINE_GROW).get()) { + flag = plot.getFlag(Flags.VINE_GROW); + if (flag.isPresent() && flag.get()) { event.setCancelled(true); } break; @@ -831,10 +841,8 @@ public class PlayerEvents extends PlotListener implements Listener { if (!plot.isAdded(pp.getUUID())) { Optional> destroy = plot.getFlag(Flags.BREAK); Block block = event.getBlock(); - if (destroy.isPresent() && destroy.get().contains(new PlotBlock((short) block.getTypeId(), block.getData()))) { - return; - } - if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) { + if (destroy.isPresent() && destroy.get().contains(new PlotBlock((short) block.getTypeId(), block.getData())) || Permissions + .hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) { return; } event.setCancelled(true); @@ -850,8 +858,8 @@ public class PlayerEvents extends PlotListener implements Listener { } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onFade(BlockFadeEvent e) { - Block b = e.getBlock(); + public void onFade(BlockFadeEvent event) { + Block b = event.getBlock(); Location location = BukkitUtil.getLocation(b.getLocation()); PlotArea area = location.getPlotArea(); if (area == null) { @@ -859,7 +867,7 @@ public class PlayerEvents extends PlotListener implements Listener { } Plot plot = area.getOwnedPlot(location); if (plot == null) { - e.setCancelled(true); + event.setCancelled(true); return; } switch (b.getType()) { @@ -867,7 +875,7 @@ public class PlayerEvents extends PlotListener implements Listener { Optional ice_melt = plot.getFlag(Flags.ICE_MELT); if (ice_melt.isPresent()) { if (!ice_melt.get()) { - e.setCancelled(true); + event.setCancelled(true); } } break; @@ -875,7 +883,7 @@ public class PlayerEvents extends PlotListener implements Listener { Optional snow_melt = plot.getFlag(Flags.SNOW_MELT); if (snow_melt.isPresent()) { if (!snow_melt.get()) { - e.setCancelled(true); + event.setCancelled(true); } } break; @@ -883,7 +891,7 @@ public class PlayerEvents extends PlotListener implements Listener { Optional soil_dry = plot.getFlag(Flags.SOIL_DRY); if (soil_dry.isPresent()) { if (!soil_dry.get()) { - e.setCancelled(true); + event.setCancelled(true); } } break; @@ -902,9 +910,8 @@ public class PlayerEvents extends PlotListener implements Listener { Plot plot = area.getOwnedPlot(tLocation); Location fLocation = BukkitUtil.getLocation(from.getLocation()); if (plot != null) { - if (plot.getFlag(Flags.DISABLE_PHYSICS).or(false)) { - event.setCancelled(true); - } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(plot, area.getOwnedPlot(fLocation))) { + if (plot.getFlag(Flags.DISABLE_PHYSICS).or(false) || !area.contains(fLocation.getX(), fLocation.getZ()) || !Objects + .equals(plot, area.getOwnedPlot(fLocation))) { event.setCancelled(true); } } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(plot, area.getOwnedPlot(fLocation))) { @@ -977,7 +984,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } } - } catch (Throwable e) { + } catch (Throwable ignored) { this.pistonBlocks = false; } } @@ -1006,7 +1013,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } } - } catch (Throwable e) { + } catch (Throwable ignored) { this.pistonBlocks = false; } } @@ -1183,7 +1190,8 @@ public class PlayerEvents extends PlotListener implements Listener { eventType = PlayerBlockEventType.INTERACT_BLOCK; lb = new BukkitLazyBlock(0, block); break; - } else if (id < 198) { + } + if (id < 198) { location = BukkitUtil.getLocation(block.getRelative(event.getBlockFace()).getLocation()); eventType = PlayerBlockEventType.PLACE_BLOCK; lb = new BukkitLazyBlock(id, block); @@ -1341,11 +1349,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } Plot plot = area.getOwnedPlotAbs(location); - if (plot == null) { - event.setCancelled(true); - return; - } - if (plot.getFlag(Flags.DISABLE_PHYSICS).or(false)) { + if (plot == null || plot.getFlag(Flags.DISABLE_PHYSICS).or(false)) { event.setCancelled(true); return; } @@ -1411,7 +1415,7 @@ public class PlayerEvents extends PlotListener implements Listener { } public boolean checkEntity(Entity entity, Plot plot) { - if (plot == null || plot.owner == null || plot.getFlags().isEmpty() && plot.getArea().DEFAULT_FLAGS.isEmpty()) { + if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot.getArea().DEFAULT_FLAGS.isEmpty()) { return false; } switch (entity.getType()) { @@ -1509,9 +1513,11 @@ public class PlayerEvents extends PlotListener implements Listener { } else { return checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP); } - } else if (entity instanceof Vehicle) { + } + if (entity instanceof Vehicle) { return checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP); - } else if (entity instanceof Hanging) { + } + if (entity instanceof Hanging) { return checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP); } return checkEntity(plot, Flags.ENTITY_CAP); @@ -1519,8 +1525,8 @@ public class PlayerEvents extends PlotListener implements Listener { } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onBlockBurn(BlockBurnEvent e) { - Block b = e.getBlock(); + public void onBlockBurn(BlockBurnEvent event) { + Block b = event.getBlock(); Location location = BukkitUtil.getLocation(b.getLocation()); PlotArea area = location.getPlotArea(); @@ -1530,8 +1536,7 @@ public class PlayerEvents extends PlotListener implements Listener { Plot plot = location.getOwnedPlot(); if (plot == null || !plot.getFlag(Flags.BLOCK_BURN).or(false)) { - e.setCancelled(true); - return; + event.setCancelled(true); } } @@ -1582,56 +1587,41 @@ public class PlayerEvents extends PlotListener implements Listener { } else if (!plot.getFlag(Flags.BLOCK_IGNITION).or(false)) { event.setCancelled(true); } - } else if (ignitingEntity != null) { - if (plot == null || !plot.getFlag(Flags.BLOCK_IGNITION).or(false)) { + } else { + if (plot == null) { event.setCancelled(true); return; } - if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) { - if (ignitingEntity instanceof Fireball) { - Projectile fireball = (Projectile) ignitingEntity; - Location location = null; - if (fireball.getShooter() instanceof Entity) { - Entity shooter = (Entity) fireball.getShooter(); - location = BukkitUtil.getLocation(shooter.getLocation()); - } else if (fireball.getShooter() instanceof BlockProjectileSource) { - Block shooter = ((BlockProjectileSource) fireball.getShooter()).getBlock(); - location = BukkitUtil.getLocation(shooter.getLocation()); - } - if (location != null && (location.getPlot() == null || !location.getPlot().equals(plot))) { - event.setCancelled(true); + if (ignitingEntity != null) { + if (!plot.getFlag(Flags.BLOCK_IGNITION).or(false)) { + event.setCancelled(true); + return; + } + if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) { + if (ignitingEntity instanceof Fireball) { + Projectile fireball = (Projectile) ignitingEntity; + Location location = null; + if (fireball.getShooter() instanceof Entity) { + Entity shooter = (Entity) fireball.getShooter(); + location = BukkitUtil.getLocation(shooter.getLocation()); + } else if (fireball.getShooter() instanceof BlockProjectileSource) { + Block shooter = ((BlockProjectileSource) fireball.getShooter()).getBlock(); + location = BukkitUtil.getLocation(shooter.getLocation()); + } + if (location != null && !plot.equals(location.getPlot())) { + event.setCancelled(true); + } } } - } - } else if (event.getIgnitingBlock() != null) { - Block ignitingBlock = event.getIgnitingBlock(); - if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL) { - if (plot == null || !plot.getFlag(Flags.BLOCK_IGNITION).or(false)) { + } else if (event.getIgnitingBlock() != null) { + Block ignitingBlock = event.getIgnitingBlock(); + Plot plotIgnited = BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot(); + if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL && (!plot.getFlag(Flags.BLOCK_IGNITION).or(false) + || plotIgnited == null || !plotIgnited.equals(plot)) + || (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) && ( + !plot.getFlag(Flags.BLOCK_IGNITION).or(false) || plotIgnited == null || !plotIgnited.equals(plot))) { event.setCancelled(true); - return; - } - if (BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot() == null) { - event.setCancelled(true); - return; - } - if (!BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot().equals(plot)) { - event.setCancelled(true); - return; - } - } - if (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) { - if (plot == null || !plot.getFlag(Flags.BLOCK_IGNITION).or(false)) { - event.setCancelled(true); - return; - } - if (BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot() == null) { - event.setCancelled(true); - return; - } - if (!BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot().equals(plot)) { - event.setCancelled(true); - return; } } } @@ -1931,7 +1921,8 @@ public class PlayerEvents extends PlotListener implements Listener { event.setCancelled(true); } return; - } else if (!plot.isAdded(pp.getUUID())) { + } + if (!plot.isAdded(pp.getUUID())) { if (!plot.getFlag(Flags.HANGING_PLACE).or(false)) { if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER); @@ -2055,13 +2046,13 @@ public class PlayerEvents extends PlotListener implements Listener { } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onVehicleDestroy(VehicleDestroyEvent e) { - Location l = BukkitUtil.getLocation(e.getVehicle()); + public void onVehicleDestroy(VehicleDestroyEvent event) { + Location l = BukkitUtil.getLocation(event.getVehicle()); PlotArea area = l.getPlotArea(); if (area == null) { return; } - Entity d = e.getAttacker(); + Entity d = event.getAttacker(); if (d instanceof Player) { Player p = (Player) d; PlotPlayer pp = BukkitUtil.getPlayer(p); @@ -2069,13 +2060,13 @@ public class PlayerEvents extends PlotListener implements Listener { if (plot == null) { if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road"); - e.setCancelled(true); + event.setCancelled(true); } } else { if (!plot.hasOwner()) { if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.unowned"); - e.setCancelled(true); + event.setCancelled(true); return; } return; @@ -2086,7 +2077,7 @@ public class PlayerEvents extends PlotListener implements Listener { } if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.other"); - e.setCancelled(true); + event.setCancelled(true); } } } @@ -2113,15 +2104,15 @@ public class PlayerEvents extends PlotListener implements Listener { } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent e) { - Entity damager = e.getDamager(); + public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) { + Entity damager = event.getDamager(); Location l = BukkitUtil.getLocation(damager); if (!PS.get().hasPlotArea(l.getWorld())) { return; } - Entity victim = e.getEntity(); + Entity victim = event.getEntity(); if (!entityDamage(damager, victim)) { - e.setCancelled(true); + event.setCancelled(true); } } @@ -2267,29 +2258,29 @@ public class PlayerEvents extends PlotListener implements Listener { } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onPlayerEggThrow(PlayerEggThrowEvent e) { - Location l = BukkitUtil.getLocation(e.getEgg().getLocation()); + public void onPlayerEggThrow(PlayerEggThrowEvent event) { + Location l = BukkitUtil.getLocation(event.getEgg().getLocation()); PlotArea area = l.getPlotArea(); if (area == null) { return; } - Player p = e.getPlayer(); + Player p = event.getPlayer(); PlotPlayer pp = BukkitUtil.getPlayer(p); Plot plot = area.getPlot(l); if (plot == null) { if (!Permissions.hasPermission(pp, "plots.admin.projectile.road")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road"); - e.setHatching(false); + event.setHatching(false); } } else if (!plot.hasOwner()) { if (!Permissions.hasPermission(pp, "plots.admin.projectile.unowned")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.unowned"); - e.setHatching(false); + event.setHatching(false); } } else if (!plot.isAdded(pp.getUUID())) { if (!Permissions.hasPermission(pp, "plots.admin.projectile.other")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other"); - e.setHatching(false); + event.setHatching(false); } } } @@ -2336,7 +2327,7 @@ public class PlayerEvents extends PlotListener implements Listener { if (loc.getY() > area.MAX_BUILD_HEIGHT && loc.getY() < area.MIN_BUILD_HEIGHT && !Permissions .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) { event.setCancelled(true); - MainUtil.sendMessage(pp, C.HEIGHT_LIMIT.s().replace("{limit}", "" + area.MAX_BUILD_HEIGHT)); + MainUtil.sendMessage(pp, C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT))); } } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java index 73e2f1965..6a9b3abb0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_9.java @@ -9,9 +9,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.LingeringPotionSplashEvent; -/** - * Created by Jesse on 3/30/2016. - */ public class PlayerEvents_1_9 implements Listener { private final PlayerEvents parent; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java index bd6f78de9..4c154fdaa 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java @@ -27,6 +27,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; +import java.util.Set; public class WEListener implements Listener { @@ -35,16 +36,16 @@ public class WEListener implements Listener { public final HashSet rad2 = new HashSet<>(Arrays.asList("fill", "fillr", "removenear", "remove")); public final HashSet rad2_1 = new HashSet<>(Arrays.asList("hcyl", "cyl")); public final HashSet rad2_2 = new HashSet<>(Arrays.asList("sphere", "pyramid")); - public final HashSet rad2_3 = new HashSet<>(Collections.singletonList("brush smooth")); - public final HashSet rad3_1 = new HashSet<>(Collections.singletonList("brush gravity")); + public final Set rad2_3 = Collections.singleton("brush smooth"); + public final Set rad3_1 = Collections.singleton("brush gravity"); public final HashSet rad3_2 = new HashSet<>(Arrays.asList("brush sphere", "brush cylinder")); public final HashSet region = new HashSet<>( Arrays.asList("move", "set", "replace", "overlay", "walls", "outline", "deform", "hollow", "smooth", "naturalize", "paste", "count", "distr", "regen", "copy", "cut", "green", "setbiome")); - public final HashSet regionExtend = new HashSet<>(Collections.singletonList("stack")); - public final HashSet restricted = new HashSet<>(Collections.singletonList("up")); + public final Set regionExtend = Collections.singleton("stack"); + public final Set restricted = Collections.singleton("up"); public final HashSet other = new HashSet<>(Arrays.asList("undo", "redo")); public String reduceCmd(String cmd, boolean single) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java index 89e457d2e..b7054a632 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java @@ -57,14 +57,14 @@ public class DefaultTitleManager extends TitleManager { // Send title Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getTitle()) + "\",color:" + this.titleColor.name().toLowerCase() - + "}"); + + '}'); packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[0], serialized); sendPacket.invoke(connection, packet); if (!this.getSubtitle().isEmpty()) { // Send subtitle if present serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getSubtitle()) + "\",color:" + this.subtitleColor.name() - .toLowerCase() + "}"); + .toLowerCase() + '}'); packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[1], serialized); sendPacket.invoke(connection, packet); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java index 11dc5fefb..de5774cd4 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java @@ -148,7 +148,7 @@ public class HackTitleManager extends TitleManager { return null; } - private Field getField(String name, Class clazz) throws Exception { + private Field getField(String name, Class clazz) throws NoSuchFieldException, SecurityException { return clazz.getDeclaredField(name); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java index e181810f8..7d1a89709 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java @@ -742,12 +742,12 @@ public class BukkitChunkManager extends ChunkManager { chest.getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate chest: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate chest: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (IllegalArgumentException ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate chest (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate chest (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocEntry : this.signContents.entrySet()) { @@ -765,14 +765,14 @@ public class BukkitChunkManager extends ChunkManager { state.update(true); } else { PS.debug( - "&c[WARN] Plot clear failed to regenerate sign: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry + "&c[WARN] Plot clear failed to regenerate sign: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry .getKey().y - + "," + ( + + ',' + ( blockLocEntry.getKey().z + zOffset)); } - } catch (IndexOutOfBoundsException e) { - PS.debug("&c[WARN] Plot clear failed to regenerate sign: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry.getKey().y - + "," + ( + } catch (IndexOutOfBoundsException ignored) { + PS.debug("&c[WARN] Plot clear failed to regenerate sign: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry.getKey().y + + ',' + ( blockLocEntry.getKey().z + zOffset)); } } @@ -785,12 +785,12 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (IllegalArgumentException ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocEntry : this.dropperContents.entrySet()) { @@ -802,12 +802,12 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (IllegalArgumentException ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocEntry : this.beaconContents.entrySet()) { @@ -819,12 +819,12 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate beacon: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate beacon: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (IllegalArgumentException ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate beacon (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate beacon (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocMaterialEntry : this.jukeboxDisc.entrySet()) { @@ -837,15 +837,15 @@ public class BukkitChunkManager extends ChunkManager { ((Jukebox) state).setPlaying(blockLocMaterialEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to restore jukebox: " + (blockLocMaterialEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to restore jukebox: " + (blockLocMaterialEntry.getKey().x + xOffset) + ',' + blockLocMaterialEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocMaterialEntry.getKey().z + zOffset)); } } catch (Exception ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate jukebox (e): " + (blockLocMaterialEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to regenerate jukebox (e): " + (blockLocMaterialEntry.getKey().x + xOffset) + ',' + blockLocMaterialEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocMaterialEntry.getKey().z + zOffset)); } } @@ -863,12 +863,12 @@ public class BukkitChunkManager extends ChunkManager { ((Skull) state).setSkullType((SkullType) data[3]); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to restore skull: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to restore skull: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (Exception e) { - PS.debug("&c[WARN] Plot clear failed to regenerate skull (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate skull (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); e.printStackTrace(); } } @@ -881,12 +881,12 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate hopper: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate hopper: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } catch (IllegalArgumentException ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate hopper (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate hopper (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocNoteEntry : this.noteBlockContents.entrySet()) { @@ -898,15 +898,15 @@ public class BukkitChunkManager extends ChunkManager { ((NoteBlock) state).setNote(blockLocNoteEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate note block: " + (blockLocNoteEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to regenerate note block: " + (blockLocNoteEntry.getKey().x + xOffset) + ',' + blockLocNoteEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocNoteEntry.getKey().z + zOffset)); } } catch (Exception ignored) { - PS.debug("&c[WARN] Plot clear failed to regenerate note block (e): " + (blockLocNoteEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to regenerate note block (e): " + (blockLocNoteEntry.getKey().x + xOffset) + ',' + blockLocNoteEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocNoteEntry.getKey().z + zOffset)); } } @@ -918,14 +918,14 @@ public class BukkitChunkManager extends ChunkManager { if (state instanceof BrewingStand) { ((BrewingStand) state).setBrewingTime(blockLocShortEntry.getValue()); } else { - PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking: " + (blockLocShortEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking: " + (blockLocShortEntry.getKey().x + xOffset) + ',' + blockLocShortEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocShortEntry.getKey().z + zOffset)); } } catch (Exception ignored) { - PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking (e): " + (blockLocShortEntry.getKey().x + xOffset) + "," - + blockLocShortEntry.getKey().y + "," + (blockLocShortEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking (e): " + (blockLocShortEntry.getKey().x + xOffset) + ',' + + blockLocShortEntry.getKey().y + ',' + (blockLocShortEntry.getKey().z + zOffset)); } } for (Entry blockLocEntityTypeEntry : this.spawnerData.entrySet()) { @@ -938,14 +938,14 @@ public class BukkitChunkManager extends ChunkManager { ((CreatureSpawner) state).setSpawnedType(blockLocEntityTypeEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to restore spawner type: " + (blockLocEntityTypeEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to restore spawner type: " + (blockLocEntityTypeEntry.getKey().x + xOffset) + ',' + blockLocEntityTypeEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocEntityTypeEntry.getKey().z + zOffset)); } - } catch (Exception e) { - PS.debug("&c[WARN] Plot clear failed to restore spawner type (e): " + (blockLocEntityTypeEntry.getKey().x + xOffset) + "," - + blockLocEntityTypeEntry.getKey().y + "," + (blockLocEntityTypeEntry.getKey().z + zOffset)); + } catch (Exception ignored) { + PS.debug("&c[WARN] Plot clear failed to restore spawner type (e): " + (blockLocEntityTypeEntry.getKey().x + xOffset) + ',' + + blockLocEntityTypeEntry.getKey().y + ',' + (blockLocEntityTypeEntry.getKey().z + zOffset)); } } for (Entry blockLocStringEntry : this.cmdData.entrySet()) { @@ -957,15 +957,15 @@ public class BukkitChunkManager extends ChunkManager { ((CommandBlock) state).setCommand(blockLocStringEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to restore command block: " + (blockLocStringEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to restore command block: " + (blockLocStringEntry.getKey().x + xOffset) + ',' + blockLocStringEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocStringEntry.getKey().z + zOffset)); } - } catch (Exception e) { - PS.debug("&c[WARN] Plot clear failed to restore command block (e): " + (blockLocStringEntry.getKey().x + xOffset) + "," + } catch (Exception ignored) { + PS.debug("&c[WARN] Plot clear failed to restore command block (e): " + (blockLocStringEntry.getKey().x + xOffset) + ',' + blockLocStringEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocStringEntry.getKey().z + zOffset)); } } @@ -978,15 +978,15 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand: " + (blockLocEntry.getKey().x + xOffset) + "," + PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry - .getKey().y + "," + ( + .getKey().y + ',' + ( blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { - PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand (e): " + (blockLocEntry.getKey().x + xOffset) + "," - + blockLocEntry.getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + } catch (IllegalArgumentException ignored) { + PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + + blockLocEntry.getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocEntry : this.furnaceTime.entrySet()) { @@ -1000,13 +1000,13 @@ public class BukkitChunkManager extends ChunkManager { ((Furnace) state).setCookTime(time[1]); } else { PS.debug( - "&c[WARN] Plot clear failed to restore furnace cooking: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + "&c[WARN] Plot clear failed to restore furnace cooking: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } - } catch (Exception e) { + } catch (Exception ignored) { PS.debug( - "&c[WARN] Plot clear failed to restore furnace cooking (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + "&c[WARN] Plot clear failed to restore furnace cooking (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocEntry : this.furnaceContents.entrySet()) { @@ -1018,12 +1018,12 @@ public class BukkitChunkManager extends ChunkManager { ((InventoryHolder) state).getInventory().setContents(blockLocEntry.getValue()); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate furnace: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate furnace: " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { - PS.debug("&c[WARN] Plot clear failed to regenerate furnace (e): " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry - .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); + } catch (IllegalArgumentException ignored) { + PS.debug("&c[WARN] Plot clear failed to regenerate furnace (e): " + (blockLocEntry.getKey().x + xOffset) + ',' + blockLocEntry + .getKey().y + ',' + (blockLocEntry.getKey().z + zOffset)); } } for (Entry blockLocByteEntry : this.bannerBase.entrySet()) { @@ -1039,12 +1039,12 @@ public class BukkitChunkManager extends ChunkManager { banner.setPatterns(patterns); state.update(true); } else { - PS.debug("&c[WARN] Plot clear failed to regenerate banner: " + (blockLocByteEntry.getKey().x + xOffset) + "," - + blockLocByteEntry.getKey().y + "," + (blockLocByteEntry.getKey().z + zOffset)); + PS.debug("&c[WARN] Plot clear failed to regenerate banner: " + (blockLocByteEntry.getKey().x + xOffset) + ',' + + blockLocByteEntry.getKey().y + ',' + (blockLocByteEntry.getKey().z + zOffset)); } - } catch (Exception e) { - PS.debug("&c[WARN] Plot clear failed to regenerate banner (e): " + (blockLocByteEntry.getKey().x + xOffset) + "," - + blockLocByteEntry.getKey().y + "," + (blockLocByteEntry.getKey().z + zOffset)); + } catch (Exception ignored) { + PS.debug("&c[WARN] Plot clear failed to regenerate banner (e): " + (blockLocByteEntry.getKey().x + xOffset) + ',' + + blockLocByteEntry.getKey().y + ',' + (blockLocByteEntry.getKey().z + zOffset)); } } } @@ -1074,33 +1074,42 @@ public class BukkitChunkManager extends ChunkManager { if (block.getState() instanceof InventoryHolder) { InventoryHolder inventoryHolder = (InventoryHolder) block.getState(); ItemStack[] inventory = inventoryHolder.getInventory().getContents().clone(); - if (id == Material.CHEST) { - this.chestContents.put(bl, inventory); - } else if (id == Material.DISPENSER) { - this.dispenserContents.put(bl, inventory); - } else if (id == Material.BEACON) { - this.beaconContents.put(bl, inventory); - } else if (id == Material.DROPPER) { - this.dropperContents.put(bl, inventory); - } else if (id == Material.HOPPER) { - this.hopperContents.put(bl, inventory); - } else if (id == Material.BREWING_STAND) { - BrewingStand brewingStand = (BrewingStand) inventoryHolder; - short time = (short) brewingStand.getBrewingTime(); - if (time > 0) { - this.brewTime.put(bl, time); - } - ItemStack[] invBre = brewingStand.getInventory().getContents().clone(); - this.brewingStandContents.put(bl, invBre); - } else if (id == Material.FURNACE || id == Material.BURNING_FURNACE) { - Furnace furnace = (Furnace) inventoryHolder; - short burn = furnace.getBurnTime(); - short cook = furnace.getCookTime(); - ItemStack[] invFur = furnace.getInventory().getContents().clone(); - this.furnaceContents.put(bl, invFur); - if (cook != 0) { - this.furnaceTime.put(bl, new Short[]{burn, cook}); - } + switch (id) { + case CHEST: + this.chestContents.put(bl, inventory); + break; + case DISPENSER: + this.dispenserContents.put(bl, inventory); + break; + case BEACON: + this.beaconContents.put(bl, inventory); + break; + case DROPPER: + this.dropperContents.put(bl, inventory); + break; + case HOPPER: + this.hopperContents.put(bl, inventory); + break; + case BREWING_STAND: + BrewingStand brewingStand = (BrewingStand) inventoryHolder; + short time = (short) brewingStand.getBrewingTime(); + if (time > 0) { + this.brewTime.put(bl, time); + } + ItemStack[] invBre = brewingStand.getInventory().getContents().clone(); + this.brewingStandContents.put(bl, invBre); + break; + case FURNACE: + case BURNING_FURNACE: + Furnace furnace = (Furnace) inventoryHolder; + short burn = furnace.getBurnTime(); + short cook = furnace.getCookTime(); + ItemStack[] invFur = furnace.getInventory().getContents().clone(); + this.furnaceContents.put(bl, invFur); + if (cook != 0) { + this.furnaceTime.put(bl, new Short[]{burn, cook}); + } + break; } } else if (block.getState() instanceof CreatureSpawner) { CreatureSpawner spawner = (CreatureSpawner) block.getState(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index 13a559d9c..fff80fe74 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -194,7 +194,7 @@ public class BukkitUtil extends WorldUtil { try { Biome biome = Biome.valueOf(biomeStr.toUpperCase()); return Arrays.asList(Biome.values()).indexOf(biome); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException ignored) { return -1; } } @@ -252,7 +252,7 @@ public class BukkitUtil extends WorldUtil { } } return false; - } catch (Exception e) { + } catch (Exception ignored) { return false; } } @@ -271,8 +271,7 @@ public class BukkitUtil extends WorldUtil { try { Material material = Material.valueOf(name.toUpperCase()); return new StringComparison().new ComparisonResult(0, new PlotBlock((short) material.getId(), (byte) 0)); - } catch (IllegalArgumentException e) { - //ignored + } catch (IllegalArgumentException ignored) { } try { byte data; @@ -297,8 +296,7 @@ public class BukkitUtil extends WorldUtil { StringComparison outer = new StringComparison<>(); return outer.new ComparisonResult(match, block); - } catch (NumberFormatException e) { - //ignored + } catch (NumberFormatException ignored) { } return null; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java index abfb5994d..52afe43f7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java @@ -520,11 +520,6 @@ public class Metrics { return graph.name.equals(this.name); } - /** - * Called when the server owner decides to opt-out of BukkitMetrics while the server is running. - */ - protected void onOptOut() { - } } /** diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java index cb4c67f63..c3e4ea506 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java @@ -24,8 +24,8 @@ import org.bukkit.block.Biome; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; @@ -223,7 +223,7 @@ public class FastQueue_1_9 extends SlowQueue { TaskManager.runTaskLater(new Runnable() { @Override public void run() { - sendChunk(fs.getChunkWrapper().world, Arrays.asList(new ChunkLoc(fs.getX(), fs.getZ()))); + sendChunk(fs.getChunkWrapper().world, Collections.singletonList(new ChunkLoc(fs.getX(), fs.getZ()))); } }, 1); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java index 2cd6d6805..c3a2fdc2b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java @@ -114,7 +114,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation { } toAdd.put(new StringWrapper(name), uuid); } - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); PS.debug(C.PREFIX + "Invalid playerdata: " + current); } @@ -153,7 +153,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation { try { UUID uuid = UUID.fromString(s); uuids.add(uuid); - } catch (Exception e) { + } catch (Exception ignored) { PS.debug(C.PREFIX + "Invalid PlayerData: " + current); } } @@ -198,7 +198,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation { ExpireManager.IMP.storeDate(uuid, last); } toAdd.put(new StringWrapper(name), uuid); - } catch (Throwable e) { + } catch (IOException ignored) { PS.debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat"); } } diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java index d1e9c11e7..f869b3eea 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java +++ b/Core/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java @@ -51,7 +51,6 @@ public class YamlConfiguration extends FileConfiguration { config.load(file); } catch (InvalidConfigurationException | IOException ex) { try { - file.getAbsolutePath(); File dest = new File(file.getAbsolutePath() + "_broken"); int i = 0; while (dest.exists()) { @@ -126,7 +125,7 @@ public class YamlConfiguration extends FileConfiguration { input = (Map) yaml.load(contents); } catch (final YAMLException e) { throw new InvalidConfigurationException(e); - } catch (final ClassCastException e) { + } catch (final ClassCastException ignored) { throw new InvalidConfigurationException("Top level is not a Map."); } @@ -189,7 +188,7 @@ public class YamlConfiguration extends FileConfiguration { if (options().copyHeader()) { final Configuration def = getDefaults(); - if (def != null && def instanceof FileConfiguration) { + if (def instanceof FileConfiguration) { final FileConfiguration filedefaults = (FileConfiguration) def; final String defaultsHeader = filedefaults.buildHeader(); diff --git a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java index 0640894a5..3bb971376 100644 --- a/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java +++ b/Core/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java @@ -209,7 +209,7 @@ public class ConfigurationSerialization { } else { return result; } - } catch (Throwable ex) { + } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ex) { Logger.getLogger(ConfigurationSerialization.class.getName()) .log(Level.SEVERE, "Could not call method '" + method.toString() + "' of " + this.clazz + " for deserialization", @@ -222,7 +222,7 @@ public class ConfigurationSerialization { protected ConfigurationSerializable deserializeViaCtor(Constructor ctor, Map args) { try { return ctor.newInstance(args); - } catch (Throwable ex) { + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException ex) { Logger.getLogger(ConfigurationSerialization.class.getName()) .log(Level.SEVERE, "Could not call constructor '" + ctor.toString() + "' of " + this.clazz + " for deserialization", @@ -238,22 +238,17 @@ public class ConfigurationSerialization { } ConfigurationSerializable result = null; Method method = getMethod("deserialize", true); - if (method != null) { result = deserializeViaMethod(method, args); } - if (result == null) { method = getMethod("valueOf", true); - if (method != null) { result = deserializeViaMethod(method, args); } } - if (result == null) { Constructor constructor = getConstructor(); - if (constructor != null) { result = deserializeViaCtor(constructor, args); } diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java index 791380e06..420a6ad69 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java @@ -44,7 +44,7 @@ public final class ByteArrayTag extends Tag { } String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Byte_Array" + append + ": " + hex; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java index 627fc754d..7e8c2b7e4 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java @@ -36,7 +36,7 @@ public final class ByteTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Byte" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java index 75c76b1ed..4bbbd62b5 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java @@ -373,7 +373,7 @@ public final class CompoundTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } StringBuilder bldr = new StringBuilder(); diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java index 69614f05d..54e33db01 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java @@ -16,7 +16,7 @@ public class CompoundTagBuilder { * Create a new instance. */ CompoundTagBuilder() { - this.entries = new HashMap(); + this.entries = new HashMap<>(); } /** diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java index 891f3c0ed..c5954abd0 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java @@ -36,7 +36,7 @@ public final class DoubleTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Double" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java index 2f17aff0d..21ab3734b 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java @@ -36,7 +36,7 @@ public final class FloatTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Float" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java index 5a53adffb..a33fa6952 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java @@ -48,7 +48,7 @@ public final class IntArrayTag extends Tag { } String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Int_Array" + append + ": " + hex; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java index 349c0d57b..da15b74f8 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/IntTag.java @@ -36,7 +36,7 @@ public final class IntTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Int" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java index 8eda20d3c..c81add4ec 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTag.java @@ -378,7 +378,7 @@ public final class ListTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } StringBuilder bldr = new StringBuilder(); diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java index 32a95d355..0a0d2531a 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java @@ -23,7 +23,7 @@ public class ListTagBuilder { ListTagBuilder(Class type) { checkNotNull(type); this.type = type; - this.entries = new ArrayList(); + this.entries = new ArrayList<>(); } /** diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java index ce91cc0ef..422a4a9de 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/LongTag.java @@ -36,7 +36,7 @@ public final class LongTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Long" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java index c368282d3..df96b425e 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java @@ -36,7 +36,7 @@ public final class ShortTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_Short" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java b/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java index 1f8ceb123..0360715c0 100644 --- a/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java +++ b/Core/src/main/java/com/intellectualcrafters/jnbt/StringTag.java @@ -40,7 +40,7 @@ public final class StringTag extends Tag { public String toString() { String name = getName(); String append = ""; - if (name != null && !name.equals("")) { + if (name != null && !name.isEmpty()) { append = "(\"" + getName() + "\")"; } return "TAG_String" + append + ": " + this.value; diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java b/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java index 768032038..1cb9f55d8 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java +++ b/Core/src/main/java/com/intellectualcrafters/json/JSONObject.java @@ -1330,7 +1330,7 @@ public class JSONObject { } } return true; - } catch (Throwable exception) { + } catch (JSONException exception) { return false; } } diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONString.java b/Core/src/main/java/com/intellectualcrafters/json/JSONString.java index 2cf8273a9..231506795 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONString.java +++ b/Core/src/main/java/com/intellectualcrafters/json/JSONString.java @@ -12,5 +12,5 @@ public interface JSONString { * * @return A strictly syntactically correct JSON text. */ - public String toJSONString(); + String toJSONString(); } diff --git a/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java b/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java index 0563977b4..fa23fb91d 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java +++ b/Core/src/main/java/com/intellectualcrafters/json/JSONTokener.java @@ -342,7 +342,7 @@ public class JSONTokener { } back(); string = sb.toString().trim(); - if (string != null && string.isEmpty()) { + if (string.isEmpty()) { throw syntaxError("Missing value"); } return JSONObject.stringToValue(string); @@ -370,7 +370,7 @@ public class JSONTokener { index = startIndex; character = startCharacter; line = startLine; - return c; + return 0; } } while (c != to); } catch (final IOException exception) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PS.java b/Core/src/main/java/com/intellectualcrafters/plot/PS.java index 2273590c0..0007d967b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/PS.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/PS.java @@ -137,7 +137,7 @@ public class PS { try { URL url = PS.class.getProtectionDomain().getCodeSource().getLocation(); this.file = new File(new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")).toURI().getPath()); - } catch (MalformedURLException | URISyntaxException | SecurityException | NullPointerException e) { + } catch (MalformedURLException | URISyntaxException | SecurityException e) { e.printStackTrace(); this.file = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar"); if (!this.file.exists()) { @@ -489,11 +489,10 @@ public class PS { return areas[0]; } else if (id == null) { return null; - } else { - for (PlotArea area : areas) { - if (StringMan.isEqual(id, area.id)) { - return area; - } + } + for (PlotArea area : areas) { + if (StringMan.isEqual(id, area.id)) { + return area; } } return null; @@ -1474,7 +1473,7 @@ public class PS { return; } if (type == 1) { - throw new IllegalArgumentException("Invalid type for multi-area world. Expected `2`, got `" + type + "`"); + throw new IllegalArgumentException("Invalid type for multi-area world. Expected `2`, got `" + 1 + "`"); } for (String areaId : areasSection.getKeys(false)) { PS.log(C.PREFIX + "&3 - " + areaId); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java index c58954355..21c4fb848 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java @@ -112,7 +112,7 @@ public class Area extends SubCommand { object.plotManager = "PlotSquared"; object.setupGenerator = "PlotSquared"; object.step = area.getSettingNodes(); - final String path = "worlds." + area.worldname + ".areas." + area.id + "-" + object.min + "-" + object.max; + final String path = "worlds." + area.worldname + ".areas." + area.id + '-' + object.min + '-' + object.max; Runnable run = new Runnable() { @Override public void run() { @@ -254,7 +254,7 @@ public class Area extends SubCommand { } }; if (hasConfirmation(player)) { - CmdConfirm.addPending(player, getCommandString() + " " + StringMan.join(args, " "), run); + CmdConfirm.addPending(player, getCommandString() + ' ' + StringMan.join(args, " "), run); } else { run.run(); } @@ -310,11 +310,11 @@ public class Area extends SubCommand { int claimed = area.getPlotCount(); int clusters = area.getClusters().size(); String region; - String generator = area.getGenerator() + ""; + String generator = String.valueOf(area.getGenerator()); if (area.TYPE == 2) { PlotId min = area.getMin(); PlotId max = area.getMax(); - name = area.worldname + ";" + area.id + ";" + min + ";" + max; + name = area.worldname + ';' + area.id + ';' + min + ';' + max; int size = (max.x - min.x + 1) * (max.y - min.y + 1); percent = claimed == 0 ? 0 : size / (double) claimed; region = area.getRegion().toString(); @@ -326,7 +326,7 @@ public class Area extends SubCommand { String value = "&r$1NAME: " + name + "\n$1Type: $2" + area.TYPE + "\n$1Terrain: $2" + area.TERRAIN - + "\n$1Usage: $2" + String.format("%.2f", percent) + "%" + + "\n$1Usage: $2" + String.format("%.2f", percent) + '%' + "\n$1Claimed: $2" + claimed + "\n$1Clusters: $2" + clusters + "\n$1Region: $2" + region @@ -363,11 +363,11 @@ public class Area extends SubCommand { int claimed = area.getPlotCount(); int clusters = area.getClusters().size(); String region; - String generator = area.getGenerator() + ""; + String generator = String.valueOf(area.getGenerator()); if (area.TYPE == 2) { PlotId min = area.getMin(); PlotId max = area.getMax(); - name = area.worldname + ";" + area.id + ";" + min + ";" + max; + name = area.worldname + ';' + area.id + ';' + min + ';' + max; int size = (max.x - min.x + 1) * (max.y - min.y + 1); percent = claimed == 0 ? 0 : size / (double) claimed; region = area.getRegion().toString(); @@ -377,18 +377,18 @@ public class Area extends SubCommand { region = "N/A"; } PlotMessage tooltip = new PlotMessage() - .text("Claimed=").color("$1").text("" + claimed).color("$2") - .text("\nUsage=").color("$1").text(String.format("%.2f", percent) + "%").color("$2") - .text("\nClusters=").color("$1").text("" + clusters).color("$2") + .text("Claimed=").color("$1").text(String.valueOf(claimed)).color("$2") + .text("\nUsage=").color("$1").text(String.format("%.2f", percent) + '%').color("$2") + .text("\nClusters=").color("$1").text(String.valueOf(clusters)).color("$2") .text("\nRegion=").color("$1").text(region).color("$2") .text("\nGenerator=").color("$1").text(generator).color("$2"); // type / terrain String visit = "/plot area tp " + area.toString(); message.text("[").color("$3") - .text(i + "").command(visit).tooltip(visit).color("$1") + .text(String.valueOf(i)).command(visit).tooltip(visit).color("$1") .text("]").color("$3") - .text(" " + name).tooltip(tooltip).command(getCommandString() + " info " + area).color("$1").text(" - ") + .text(' ' + name).tooltip(tooltip).command(getCommandString() + " info " + area).color("$1").text(" - ") .color("$2") .text(area.TYPE + ":" + area.TERRAIN).color("$3"); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java index ac370bfb3..041368a0f 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java @@ -72,7 +72,7 @@ public class Auto extends SubCommand { if (args.length > 1) { schematic = args[1]; } - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { size_x = 1; size_z = 1; schematic = args[0]; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java index 3f0bfc80a..104920752 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java @@ -92,7 +92,7 @@ public class DebugClaimTest extends SubCommand { } if (uuid != null) { MainUtil.sendMessage(plr, " - &aFound plot: " + plot.getId() + " : " + line); - plot.owner = uuid; + plot.setOwner(uuid); plots.add(plot); } else { MainUtil.sendMessage(plr, " - &cInvalid PlayerName: " + plot.getId() + " : " + line); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java index ef0797fe4..d8dc726c4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java @@ -31,11 +31,6 @@ import java.util.Map; permission = "plots.flag") public class FlagCmd extends SubCommand { - @Override - public String getUsage() { - return super.getUsage(); - } - @Override public boolean onCommand(PlotPlayer player, String[] args) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java index 53035ddb6..468e63252 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java @@ -5,6 +5,7 @@ import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.Command; import java.io.File; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; @@ -58,7 +59,7 @@ public class GenerateDocs { String comment = GenerateDocs.getComments(lines); GenerateDocs.log("#### Description"); - GenerateDocs.log("`" + command.getDescription() + "`"); + GenerateDocs.log('`' + command.getDescription() + '`'); if (!comment.isEmpty()) { GenerateDocs.log("##### Comments"); GenerateDocs.log("``` java"); @@ -76,18 +77,18 @@ public class GenerateDocs { GenerateDocs.log(" - `" + StringMan.join(usages, "`\n - `") + "` "); GenerateDocs.log(""); } else { - GenerateDocs.log("`" + mainUsage + "` "); + GenerateDocs.log('`' + mainUsage + "` "); } if (command.getRequiredType() != RequiredType.NONE) { GenerateDocs.log("#### Required callers"); - GenerateDocs.log("`" + command.getRequiredType().name() + "`"); + GenerateDocs.log('`' + command.getRequiredType().name() + '`'); } List aliases = command.getAliases(); if (!aliases.isEmpty()) { GenerateDocs.log("#### Aliases"); - GenerateDocs.log("`" + StringMan.getString(command.getAliases()) + "`"); + GenerateDocs.log('`' + StringMan.getString(command.getAliases()) + '`'); } GenerateDocs.log("#### Permissions"); @@ -96,21 +97,21 @@ public class GenerateDocs { GenerateDocs.log(" - `" + command.getPermission() + "` "); GenerateDocs.log(""); GenerateDocs.log("##### Other"); - GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + "`"); + GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + '`'); GenerateDocs.log(""); } else { - GenerateDocs.log("`" + command.getPermission() + "` "); + GenerateDocs.log('`' + command.getPermission() + "` "); } GenerateDocs.log("***"); GenerateDocs.log(""); - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); } } public static List getUsage(String cmd, List lines) { Pattern p = Pattern.compile("\"([^\"]*)\""); - HashSet usages = new HashSet(); + HashSet usages = new HashSet<>(); for (String line : lines) { if (line.contains("COMMAND_SYNTAX") && !line.contains("getUsage()")) { Matcher m = p.matcher(line); @@ -203,7 +204,7 @@ public class GenerateDocs { line = line.trim(); if (line.startsWith("/** ") || line.startsWith("*/ ") || line.startsWith("* ")) { line = line.replaceAll("/[*][*] ", "").replaceAll("[*]/ ", "").replaceAll("[*] ", "").trim(); - result.append(line + "\n"); + result.append(line + '\n'); } } return result.toString().trim(); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java index c67c53e51..69d1c5961 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java @@ -245,12 +245,10 @@ public class ListCmd extends SubCommand { } plots = new ArrayList<>(); for (Plot plot : PS.get().getPlots()) { -/* - Flag price = FlagManager.getPlotFlagRaw(plot, "price"); - if (price != null) { + Optional price = plot.getFlag(Flags.PRICE); + if (price.isPresent()) { plots.add(plot); } -*/ } break; case "unowned": diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java index 3dcb50e64..d10c3887e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java @@ -14,7 +14,6 @@ import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.UUIDHandler; import com.plotsquared.general.commands.CommandDeclaration; -import java.util.HashSet; import java.util.UUID; @CommandDeclaration(command = "merge", @@ -74,7 +73,7 @@ public class Merge extends SubCommand { final PlotArea plotworld = plot.getArea(); final double price = plotworld.PRICES.containsKey("merge") ? plotworld.PRICES.get("merge") : 0; if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d && EconHandler.manager.getMoney(plr) < price) { - sendMessage(plr, C.CANNOT_AFFORD_MERGE, price + ""); + sendMessage(plr, C.CANNOT_AFFORD_MERGE, String.valueOf(price)); return false; } final int size = plot.getConnectedPlots().size(); @@ -108,7 +107,7 @@ public class Merge extends SubCommand { if (plot.autoMerge(-1, maxSize, uuid, terrain)) { if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d) { EconHandler.manager.withdrawMoney(plr, price); - sendMessage(plr, C.REMOVED_BALANCE, price + ""); + sendMessage(plr, C.REMOVED_BALANCE, String.valueOf(price)); } MainUtil.sendMessage(plr, C.SUCCESS_MERGE); return true; @@ -138,7 +137,7 @@ public class Merge extends SubCommand { if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) { if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d) { EconHandler.manager.withdrawMoney(plr, price); - sendMessage(plr, C.REMOVED_BALANCE, price + ""); + sendMessage(plr, C.REMOVED_BALANCE, String.valueOf(price)); } MainUtil.sendMessage(plr, C.SUCCESS_MERGE); return true; @@ -152,7 +151,7 @@ public class Merge extends SubCommand { MainUtil.sendMessage(plr, C.NO_PERMISSION, C.PERMISSION_MERGE_OTHER); return false; } - HashSet uuids = adjacent.getOwners(); + java.util.Set uuids = adjacent.getOwners(); boolean isOnline = false; for (final UUID owner : uuids) { final PlotPlayer accepter = UUIDHandler.getPlayer(owner); @@ -173,11 +172,11 @@ public class Merge extends SubCommand { } if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d) { if (EconHandler.manager.getMoney(plr) < price) { - sendMessage(plr, C.CANNOT_AFFORD_MERGE, price + ""); + sendMessage(plr, C.CANNOT_AFFORD_MERGE, String.valueOf(price)); return; } EconHandler.manager.withdrawMoney(plr, price); - sendMessage(plr, C.REMOVED_BALANCE, price + ""); + sendMessage(plr, C.REMOVED_BALANCE, String.valueOf(price)); } MainUtil.sendMessage(plr, C.SUCCESS_MERGE); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java index 7b8f4e515..d33726f07 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java @@ -47,7 +47,7 @@ public class RegenAllRoads extends SubCommand { } String name = args[0]; PlotManager manager = area.getPlotManager(); - if ((manager == null) || !(manager instanceof HybridPlotManager)) { + if (!(manager instanceof HybridPlotManager)) { MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD); return false; } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java index 5fff60ec7..b46793554 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Setup.java @@ -65,8 +65,8 @@ public class Setup extends SubCommand { if (object.setup_index > 0) { object.setup_index--; ConfigurationNode node = object.step[object.setup_index]; - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", node.getDescription(), node.getType().getType(), - node.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, node.getDescription(), node.getType().getType(), + String.valueOf(node.getDefaultValue())); return false; } else if (object.current > 0) { object.current--; @@ -127,8 +127,8 @@ public class Setup extends SubCommand { return true; } ConfigurationNode step = object.step[object.setup_index]; - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), - step.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, step.getDescription(), step.getType().getType(), + String.valueOf(step.getDefaultValue())); } else { if (gen.isFull()) { object.plotManager = object.setupGenerator; @@ -216,8 +216,8 @@ public class Setup extends SubCommand { .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null).getSettingNodes(); } ConfigurationNode step = object.step[object.setup_index]; - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), - step.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, step.getDescription(), step.getType().getType(), + String.valueOf(step.getDefaultValue())); break; } case 6: // world setup @@ -229,8 +229,8 @@ public class Setup extends SubCommand { } ConfigurationNode step = object.step[object.setup_index]; if (args.length < 1) { - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), - step.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, step.getDescription(), step.getType().getType(), + String.valueOf(step.getDefaultValue())); return false; } boolean valid = step.isValid(args[0]); @@ -243,13 +243,13 @@ public class Setup extends SubCommand { return false; } step = object.step[object.setup_index]; - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), - step.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, step.getDescription(), step.getType().getType(), + String.valueOf(step.getDefaultValue())); return false; } else { sendMessage(plr, C.SETUP_INVALID_ARG, args[0], step.getConstant()); - sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), - step.getDefaultValue() + ""); + sendMessage(plr, C.SETUP_STEP, object.setup_index + 1, step.getDescription(), step.getType().getType(), + String.valueOf(step.getDefaultValue())); return false; } case 7: diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java index 29c180ec6..f9dd378dc 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java @@ -41,7 +41,7 @@ public class Update extends SubCommand { MainUtil.sendMessage(plr, "&cTo manually specify an update URL: /plot update "); return false; } - if (PS.get().update(null, url) && (url == PS.get().update)) { + if (PS.get().update(plr, url) && (url == PS.get().update)) { PS.get().update = null; } return true; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java index c3abd620e..18433c84e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java @@ -7,6 +7,7 @@ import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.CommandCaller; import java.io.File; +import java.io.IOException; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; @@ -730,7 +731,7 @@ public enum C { if (!split[0].equalsIgnoreCase(caption.category)) { changed = true; yml.set(key, null); - yml.set(caption.category + "." + caption.name().toLowerCase(), value); + yml.set(caption.category + '.' + caption.name().toLowerCase(), value); } captions.add(caption); caption.s = value; @@ -747,7 +748,7 @@ public enum C { // HashMap replacements = new HashMap<>(); replacements.clear(); for (String style : styles) { - replacements.put("$" + style, "\u00a7" + config.getString(style)); + replacements.put('$' + style, '§' + config.getString(style)); } for (char letter : "1234567890abcdefklmnor".toCharArray()) { replacements.put("&" + letter, "\u00a7" + letter); @@ -761,14 +762,14 @@ public enum C { continue; } changed = true; - yml.set(caption.category + "." + caption.name().toLowerCase(), caption.def); + yml.set(caption.category + '.' + caption.name().toLowerCase(), caption.def); } caption.s = StringMan.replaceFromMap(caption.s, replacements); } if (changed) { yml.save(file); } - } catch (Exception e) { + } catch (IOException | IllegalArgumentException e) { e.printStackTrace(); } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java b/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java index 09d91043c..e1545b98e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java @@ -41,7 +41,7 @@ public class Configuration { try { Integer.parseInt(string); return true; - } catch (Exception e) { + } catch (NumberFormatException ignored) { return false; } } @@ -54,12 +54,8 @@ public class Configuration { public static final SettingValue BOOLEAN = new SettingValue("BOOLEAN") { @Override public boolean validateValue(String string) { - try { - Boolean.parseBoolean(string); - return true; - } catch (Exception e) { - return false; - } + Boolean.parseBoolean(string); + return true; } @Override @@ -73,7 +69,7 @@ public class Configuration { try { Double.parseDouble(string); return true; - } catch (Exception e) { + } catch (NumberFormatException ignored) { return false; } } @@ -89,7 +85,7 @@ public class Configuration { try { int biome = WorldUtil.IMP.getBiomeFromString(string.toUpperCase()); return biome != -1; - } catch (Exception e) { + } catch (Exception ignored) { return false; } } @@ -134,7 +130,7 @@ public class Configuration { } } return true; - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { return false; } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java index 0cd6a5a2c..eb9f1c904 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java @@ -40,6 +40,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; +@SuppressWarnings("SqlDialectInspection") public class SQLManager implements AbstractDB { // Public final @@ -173,7 +174,7 @@ public class SQLManager implements AbstractDB { this.plotTasks.put(plot, tasks); } if (task == null) { - task = new UniqueStatement(plot.hashCode() + "") { + task = new UniqueStatement(String.valueOf(plot.hashCode())) { @Override public PreparedStatement get() { @@ -207,7 +208,7 @@ public class SQLManager implements AbstractDB { this.playerTasks.put(uuid, tasks); } if (task == null) { - task = new UniqueStatement(uuid.hashCode() + "") { + task = new UniqueStatement(String.valueOf(uuid.hashCode())) { @Override public PreparedStatement get() { @@ -238,7 +239,7 @@ public class SQLManager implements AbstractDB { this.clusterTasks.put(cluster, tasks); } if (task == null) { - task = new UniqueStatement(cluster.hashCode() + "") { + task = new UniqueStatement(String.valueOf(cluster.hashCode())) { @Override public PreparedStatement get() { @@ -397,7 +398,8 @@ public class SQLManager implements AbstractDB { if (count > 0) { commit(); return true; - } else if (count != -1) { + } + if (count != -1) { if (!this.connection.getAutoCommit()) { this.connection.setAutoCommit(true); } @@ -611,7 +613,7 @@ public class SQLManager implements AbstractDB { stmt.setInt(i * 5 + 2, plot.getId().y); try { stmt.setString(i * 5 + 3, plot.owner.toString()); - } catch (SQLException e) { + } catch (SQLException ignored) { stmt.setString(i * 5 + 3, AbstractDB.everyone.toString()); } stmt.setString(i * 5 + 4, plot.getArea().toString()); @@ -625,7 +627,7 @@ public class SQLManager implements AbstractDB { stmt.setInt(i * 6 + 3, plot.getId().y); try { stmt.setString(i * 6 + 4, plot.owner.toString()); - } catch (SQLException e1) { + } catch (SQLException ignored) { stmt.setString(i * 6 + 4, AbstractDB.everyone.toString()); } stmt.setString(i * 6 + 5, plot.getArea().toString()); @@ -742,18 +744,15 @@ public class SQLManager implements AbstractDB { PS.debug("&6[WARN] Could not bulk save!"); try { String nonBulk = mod.getCreateSQL(); - PreparedStatement preparedStmt = this.connection.prepareStatement(nonBulk); - for (T obj : objList) { - try { + try (PreparedStatement preparedStmt = this.connection.prepareStatement(nonBulk)) { + for (T obj : objList) { mod.setSQL(preparedStmt, obj); preparedStmt.addBatch(); - } catch (SQLException e3) { - PS.debug("&c[ERROR] Failed to save " + obj + "!"); } + PS.debug("&aBatch 3"); + preparedStmt.executeBatch(); + preparedStmt.close(); } - PS.debug("&aBatch 3"); - preparedStmt.executeBatch(); - preparedStmt.close(); } catch (SQLException e3) { e3.printStackTrace(); PS.debug("&c[ERROR] Failed to save all!"); @@ -807,9 +806,9 @@ public class SQLManager implements AbstractDB { int k = 0; for (Entry, ?> flag : pair.settings.flags.entrySet()) { if (k != 0) { - flag_string.append(","); + flag_string.append(','); } - flag_string.append(flag.getKey().getName() + ":" + flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") + flag_string.append(flag.getKey().getName() + ':' + flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") .replaceAll(",", "´")); k++; } @@ -822,7 +821,7 @@ public class SQLManager implements AbstractDB { if (loc.y == 0) { position = "DEFAULT"; } else { - position = loc.x + "," + loc.y + "," + loc.z; + position = loc.x + "," + loc.y + ',' + loc.z; } statement.setString(i * 10 + 10, position); } @@ -844,9 +843,9 @@ public class SQLManager implements AbstractDB { int k = 0; for (Entry, ?> flag : pair.settings.flags.entrySet()) { if (k != 0) { - flag_string.append(","); + flag_string.append(','); } - flag_string.append(flag.getKey().getName() + ":" + flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") + flag_string.append(flag.getKey().getName() + ':' + flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯") .replaceAll(",", "´")); k++; } @@ -862,7 +861,7 @@ public class SQLManager implements AbstractDB { if (loc.y == 0) { position = "DEFAULT"; } else { - position = loc.x + "," + loc.y + "," + loc.z; + position = loc.x + "," + loc.y + ',' + loc.z; } stmt.setString(i * 10 + 10, position); } @@ -960,10 +959,10 @@ public class SQLManager implements AbstractDB { } public void commit() { + if (this.closed) { + return; + } try { - if (this.closed) { - return; - } if (!this.connection.getAutoCommit()) { this.connection.commit(); this.connection.setAutoCommit(true); @@ -992,7 +991,6 @@ public class SQLManager implements AbstractDB { @Override public void execute(PreparedStatement statement) { - } @Override @@ -1181,7 +1179,7 @@ public class SQLManager implements AbstractDB { + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" - + ")"); + + ')'); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` (" @@ -1196,7 +1194,7 @@ public class SQLManager implements AbstractDB { + " `merged` INT(11) DEFAULT NULL," + " `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + " PRIMARY KEY (`plot_plot_id`)" - + ")"); + + ')'); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)"); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" @@ -1210,7 +1208,7 @@ public class SQLManager implements AbstractDB { + "`owner` VARCHAR(40) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" - + ")"); + + ')'); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` (`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL)"); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` (`cluster_id` INT(11) NOT NULL," @@ -1229,7 +1227,7 @@ public class SQLManager implements AbstractDB { + " `merged` INT(11) DEFAULT NULL," + " `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + " PRIMARY KEY (`cluster_id`)" - + ")"); + + ')'); stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` (" @@ -1237,7 +1235,7 @@ public class SQLManager implements AbstractDB { + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL," + " `value` blob NOT NULL" - + ")"); + + ')'); } stmt.executeBatch(); stmt.clearBatch(); @@ -1411,21 +1409,22 @@ public class SQLManager implements AbstractDB { if (cluster.temp > 0) { return cluster.temp; } - PreparedStatement stmt = this.connection.prepareStatement("SELECT `id` FROM `" + int c_id; + try (PreparedStatement stmt = this.connection.prepareStatement("SELECT `id` FROM `" + this.prefix - + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC"); - stmt.setInt(1, cluster.getP1().x); - stmt.setInt(2, cluster.getP1().y); - stmt.setInt(3, cluster.getP2().x); - stmt.setInt(4, cluster.getP2().y); - stmt.setString(5, cluster.area.toString()); - ResultSet r = stmt.executeQuery(); - int c_id = Integer.MAX_VALUE; - while (r.next()) { - c_id = r.getInt("id"); + + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) { + stmt.setInt(1, cluster.getP1().x); + stmt.setInt(2, cluster.getP1().y); + stmt.setInt(3, cluster.getP2().x); + stmt.setInt(4, cluster.getP2().y); + stmt.setString(5, cluster.area.toString()); + try (ResultSet resultSet = stmt.executeQuery()) { + c_id = Integer.MAX_VALUE; + while (resultSet.next()) { + c_id = resultSet.getInt("id"); + } + } } - stmt.close(); - r.close(); if (c_id == Integer.MAX_VALUE || c_id == 0) { if (cluster.temp > 0) { return cluster.temp; @@ -1493,8 +1492,7 @@ public class SQLManager implements AbstractDB { rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode"); if (!rs.next()) { rs.close(); - try { - Statement statement = this.connection.createStatement(); + try (Statement statement = this.connection.createStatement()) { statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`"); if (Settings.DB.USE_MYSQL) { statement.addBatch("CREATE TABLE IF NOT EXISTS `" @@ -1514,17 +1512,16 @@ public class SQLManager implements AbstractDB { + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" - + ")"); + + ')'); } statement.executeBatch(); - statement.close(); - } catch (SQLException e) { - Statement statement = this.connection.createStatement(); - statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`"); - statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0"); - statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`"); - statement.executeBatch(); - statement.close(); + } catch (SQLException ignored) { + try (Statement statement = this.connection.createStatement()) { + statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`"); + statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0"); + statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`"); + statement.executeBatch(); + } } } } @@ -1534,7 +1531,6 @@ public class SQLManager implements AbstractDB { try (Statement statement = this.connection.createStatement()) { statement.executeUpdate( "DELETE FROM `" + this.prefix + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `" + this.prefix + "plot`)"); - statement.close(); } catch (SQLException e) { e.printStackTrace(); } @@ -1555,7 +1551,6 @@ public class SQLManager implements AbstractDB { PS.debug("RESTORING: " + this.prefix + table); } } - statement.close(); } catch (SQLException e2) { e2.printStackTrace(); } @@ -1620,7 +1615,7 @@ public class SQLManager implements AbstractDB { for (String areaKey : areaSection.getKeys(false)) { String[] split = areaKey.split("(? toDelete = new ArrayList<>(); - while (resultSet.next()) { - PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"), resultSet.getInt("plot_id_z")); - id = resultSet.getInt("id"); - String areaid = resultSet.getString("world"); - if (!areas.contains(areaid)) { - if (Settings.AUTO_PURGE) { - toDelete.add(id); - continue; - } else { - AtomicInteger value = noExist.get(areaid); - if (value != null) { - value.incrementAndGet(); - } else { - noExist.put(areaid, new AtomicInteger(1)); - } - } - } - o = resultSet.getString("owner"); - user = uuids.get(o); - if (user == null) { - user = UUID.fromString(o); - uuids.put(o, user); - } - Timestamp timestamp = resultSet.getTimestamp("timestamp"); - long time = timestamp.getTime(); - Plot p = new Plot(plot_id, user, new HashSet(), new HashSet(), new HashSet(), "", null, null, null, - new boolean[]{false, false, false, false}, time, id); - HashMap map = newPlots.get(areaid); - if (map != null) { - Plot last = map.put(p.getId(), p); - if (last != null) { - map.put(last.getId(), last); + try (Statement statement = this.connection.createStatement()) { + int id; + String o; + UUID user; + try (ResultSet resultSet = statement + .executeQuery("SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `" + this.prefix + "plot`")) { + ArrayList toDelete = new ArrayList<>(); + while (resultSet.next()) { + PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"), resultSet.getInt("plot_id_z")); + id = resultSet.getInt("id"); + String areaid = resultSet.getString("world"); + if (!areas.contains(areaid)) { if (Settings.AUTO_PURGE) { toDelete.add(id); + continue; } else { - PS.debug("&cPLOT " + id + " in `" + this.prefix - + "plot` is a duplicate. Delete this plot or set `auto-purge: true` in the settings.yml."); + AtomicInteger value = noExist.get(areaid); + if (value != null) { + value.incrementAndGet(); + } else { + noExist.put(areaid, new AtomicInteger(1)); + } } - continue; } - } else { - map = new HashMap<>(); - newPlots.put(areaid, map); - map.put(p.getId(), p); + o = resultSet.getString("owner"); + user = uuids.get(o); + if (user == null) { + user = UUID.fromString(o); + uuids.put(o, user); + } + Timestamp timestamp = resultSet.getTimestamp("timestamp"); + long time = timestamp.getTime(); + Plot p = new Plot(plot_id, user, new HashSet(), new HashSet(), new HashSet(), "", null, null, null, + new boolean[]{false, false, false, false}, time, id); + HashMap map = newPlots.get(areaid); + if (map != null) { + Plot last = map.put(p.getId(), p); + if (last != null) { + map.put(last.getId(), last); + if (Settings.AUTO_PURGE) { + toDelete.add(id); + } else { + PS.debug("&cPLOT " + id + " in `" + this.prefix + + "plot` is a duplicate. Delete this plot or set `auto-purge: true` in the settings.yml."); + } + continue; + } + } else { + map = new HashMap<>(); + newPlots.put(areaid, map); + map.put(p.getId(), p); + } + plots.put(id, p); } - plots.put(id, p); + deleteRows(toDelete, this.prefix + "plot", "id"); } - deleteRows(toDelete, this.prefix + "plot", "id"); - } - if (Settings.CACHE_RATINGS) { - try (ResultSet r = statement.executeQuery("SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix + "plot_rating`")) { + if (Settings.CACHE_RATINGS) { + try (ResultSet r = statement.executeQuery("SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix + "plot_rating`")) { + ArrayList toDelete = new ArrayList<>(); + while (r.next()) { + id = r.getInt("plot_plot_id"); + o = r.getString("player"); + user = uuids.get(o); + if (user == null) { + user = UUID.fromString(o); + uuids.put(o, user); + } + Plot plot = plots.get(id); + if (plot != null) { + plot.getSettings().getRatings().put(user, r.getInt("rating")); + } else if (Settings.AUTO_PURGE) { + toDelete.add(id); + } else { + PS.debug("&cENTRY " + id + " in `plot_rating` does not exist. Create this plot or set `auto-purge: true` in the " + + "settings.yml."); + } + } + deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id"); + } + } + + /* + * Getting helpers + */ + try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) { ArrayList toDelete = new ArrayList<>(); while (r.next()) { id = r.getInt("plot_plot_id"); - o = r.getString("player"); + o = r.getString("user_uuid"); user = uuids.get(o); if (user == null) { user = UUID.fromString(o); @@ -1702,175 +1724,145 @@ public class SQLManager implements AbstractDB { } Plot plot = plots.get(id); if (plot != null) { - plot.getSettings().getRatings().put(user, r.getInt("rating")); + plot.getTrusted().add(user); } else if (Settings.AUTO_PURGE) { toDelete.add(id); } else { - PS.debug("&cENTRY " + id + " in `plot_rating` does not exist. Create this plot or set `auto-purge: true` in the " - + "settings.yml."); + PS.debug("&cENTRY " + id + " in `plot_helpers` does not exist. Create this plot or set `auto-purge: true` in the settings" + + ".yml."); } } - deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id"); + deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id"); } - } - - /* - * Getting helpers - */ - try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) { - ArrayList toDelete = new ArrayList<>(); - while (r.next()) { - id = r.getInt("plot_plot_id"); - o = r.getString("user_uuid"); - user = uuids.get(o); - if (user == null) { - user = UUID.fromString(o); - uuids.put(o, user); - } - Plot plot = plots.get(id); - if (plot != null) { - plot.getTrusted().add(user); - } else if (Settings.AUTO_PURGE) { - toDelete.add(id); - } else { - PS.debug("&cENTRY " + id + " in `plot_helpers` does not exist. Create this plot or set `auto-purge: true` in the settings" - + ".yml."); - } - } - deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id"); - } /* * Getting trusted */ - try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) { - ArrayList toDelete = new ArrayList<>(); - while (r.next()) { - id = r.getInt("plot_plot_id"); - o = r.getString("user_uuid"); - user = uuids.get(o); - if (user == null) { - user = UUID.fromString(o); - uuids.put(o, user); - } - Plot plot = plots.get(id); - if (plot != null) { - plot.getMembers().add(user); - } else if (Settings.AUTO_PURGE) { - toDelete.add(id); - } else { - PS.debug("&cENTRY " + id + " in `plot_trusted` does not exist. Create this plot or set `auto-purge: true` in the settings" - + ".yml."); + try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) { + ArrayList toDelete = new ArrayList<>(); + while (r.next()) { + id = r.getInt("plot_plot_id"); + o = r.getString("user_uuid"); + user = uuids.get(o); + if (user == null) { + user = UUID.fromString(o); + uuids.put(o, user); + } + Plot plot = plots.get(id); + if (plot != null) { + plot.getMembers().add(user); + } else if (Settings.AUTO_PURGE) { + toDelete.add(id); + } else { + PS.debug("&cENTRY " + id + " in `plot_trusted` does not exist. Create this plot or set `auto-purge: true` in the settings" + + ".yml."); + } } + deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id"); } - deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id"); - } /* * Getting denied */ - try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) { - ArrayList toDelete = new ArrayList<>(); - while (r.next()) { - id = r.getInt("plot_plot_id"); - o = r.getString("user_uuid"); - user = uuids.get(o); - if (user == null) { - user = UUID.fromString(o); - uuids.put(o, user); - } - Plot plot = plots.get(id); - if (plot != null) { - plot.getDenied().add(user); - } else if (Settings.AUTO_PURGE) { - toDelete.add(id); - } else { - PS.debug("&cENTRY " + id - + " in `plot_denied` does not exist. Create this plot or set `auto-purge: true` in the settings.yml."); - } - } - deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id"); - } - - try (ResultSet resultSet = statement.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) { - ArrayList toDelete = new ArrayList<>(); - while (resultSet.next()) { - id = resultSet.getInt("plot_plot_id"); - Plot plot = plots.get(id); - if (plot != null) { - plots.remove(id); - String alias = resultSet.getString("alias"); - if (alias != null) { - plot.getSettings().setAlias(alias); + try (ResultSet r = statement.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) { + ArrayList toDelete = new ArrayList<>(); + while (r.next()) { + id = r.getInt("plot_plot_id"); + o = r.getString("user_uuid"); + user = uuids.get(o); + if (user == null) { + user = UUID.fromString(o); + uuids.put(o, user); } - String pos = resultSet.getString("position"); - switch (pos.toLowerCase()) { - case "": - case "default": - case "0,0,0": - case "center": - break; - default: - try { - plot.getSettings().setPosition(BlockLoc.fromString(pos)); - } catch (Exception ignored) { - } - } - Integer m = resultSet.getInt("merged"); - boolean[] merged = new boolean[4]; - for (int i = 0; i < 4; i++) { - merged[3 - i] = (m & 1 << i) != 0; - } - plot.getSettings().setMerged(merged); - String[] flags_string; - String myflags = resultSet.getString("flags"); - if (myflags == null) { - flags_string = new String[]{}; + Plot plot = plots.get(id); + if (plot != null) { + plot.getDenied().add(user); + } else if (Settings.AUTO_PURGE) { + toDelete.add(id); } else { - if (!myflags.isEmpty()) { - flags_string = myflags.split(","); - } else { - flags_string = new String[]{}; - } + PS.debug("&cENTRY " + id + + " in `plot_denied` does not exist. Create this plot or set `auto-purge: true` in the settings.yml."); } - HashMap, Object> flags = new HashMap<>(); - boolean exception = false; - for (String element : flags_string) { - if (element.contains(":")) { - String[] split = element.split(":"); - try { - String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("\u00B4", ","); - Flag flag = FlagManager.getFlag(split[0]); - flags.put(flag, flag.parseValue(flag_str)); - } catch (Exception e) { - e.printStackTrace(); - exception = true; - } - } else { - element = element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ","); - if (StringMan.isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) { - Flag flag = FlagManager.getFlag(element); - flags.put(flag, flag.parseValue("")); - } else { - PS.debug("INVALID FLAG: " + element); - } - } - } - if (exception) { - PS.debug("&cPlot " + id + " | " + plot + " had an invalid flag. A fix has been attempted."); - PS.debug("&c" + myflags); - this.setFlags(plot, flags); - } - plot.getSettings().flags = flags; - } else if (Settings.AUTO_PURGE) { - toDelete.add(id); - } else { - PS.debug("&cENTRY " + id + " in `plot_settings` does not exist. Create this plot or set `auto-purge: true` in the settings" - + ".yml."); } + deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id"); + } + + try (ResultSet resultSet = statement.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) { + ArrayList toDelete = new ArrayList<>(); + while (resultSet.next()) { + id = resultSet.getInt("plot_plot_id"); + Plot plot = plots.get(id); + if (plot != null) { + plots.remove(id); + String alias = resultSet.getString("alias"); + if (alias != null) { + plot.getSettings().setAlias(alias); + } + String pos = resultSet.getString("position"); + switch (pos.toLowerCase()) { + case "": + case "default": + case "0,0,0": + case "center": + break; + default: + try { + plot.getSettings().setPosition(BlockLoc.fromString(pos)); + } catch (Exception ignored) { + } + } + Integer m = resultSet.getInt("merged"); + boolean[] merged = new boolean[4]; + for (int i = 0; i < 4; i++) { + merged[3 - i] = (m & 1 << i) != 0; + } + plot.getSettings().setMerged(merged); + String[] flags_string; + String myflags = resultSet.getString("flags"); + if (myflags == null || myflags.isEmpty()) { + flags_string = new String[]{}; + } else { + flags_string = myflags.split(","); + } + HashMap, Object> flags = new HashMap<>(); + boolean exception = false; + for (String element : flags_string) { + if (element.contains(":")) { + String[] split = element.split(":"); + try { + String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("\u00B4", ","); + Flag flag = FlagManager.getFlag(split[0]); + flags.put(flag, flag.parseValue(flag_str)); + } catch (Exception e) { + e.printStackTrace(); + exception = true; + } + } else { + element = element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ","); + if (StringMan.isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) { + Flag flag = FlagManager.getFlag(element); + flags.put(flag, flag.parseValue("")); + } else { + PS.debug("INVALID FLAG: " + element); + } + } + } + if (exception) { + PS.debug("&cPlot " + id + " | " + plot + " had an invalid flag. A fix has been attempted."); + PS.debug("&c" + myflags); + this.setFlags(plot, flags); + } + plot.getSettings().flags = flags; + } else if (Settings.AUTO_PURGE) { + toDelete.add(id); + } else { + PS.debug( + "&cENTRY " + id + " in `plot_settings` does not exist. Create this plot or set `auto-purge: true` in the settings" + + ".yml."); + } + } + deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id"); } - statement.close(); - deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id"); } if (!plots.entrySet().isEmpty()) { createEmptySettings(new ArrayList<>(plots.keySet()), null); @@ -2027,23 +2019,23 @@ public class SQLManager implements AbstractDB { stmt_prefix = " OR `plot_plot_id` = "; } PreparedStatement stmt = SQLManager.this.connection - .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_helpers` WHERE `plot_plot_id` = " + idstr + ""); + .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_helpers` WHERE `plot_plot_id` = " + idstr); stmt.executeUpdate(); stmt.close(); stmt = SQLManager.this.connection - .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_denied` WHERE `plot_plot_id` = " + idstr + ""); + .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_denied` WHERE `plot_plot_id` = " + idstr); stmt.executeUpdate(); stmt.close(); stmt = SQLManager.this.connection - .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_settings` WHERE `plot_plot_id` = " + idstr + ""); + .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_settings` WHERE `plot_plot_id` = " + idstr); stmt.executeUpdate(); stmt.close(); stmt = SQLManager.this.connection - .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_trusted` WHERE `plot_plot_id` = " + idstr + ""); + .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_trusted` WHERE `plot_plot_id` = " + idstr); stmt.executeUpdate(); stmt.close(); stmt = SQLManager.this.connection - .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = " + idstr2 + ""); + .prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = " + idstr2); stmt.executeUpdate(); stmt.close(); } catch (SQLException e) { @@ -2344,10 +2336,10 @@ public class SQLManager implements AbstractDB { try (PreparedStatement statement = this.connection .prepareStatement("SELECT `rating`, `player` FROM `" + this.prefix + "plot_rating` WHERE `plot_plot_id` = ? ")) { statement.setInt(1, getId(plot)); - try (ResultSet set = statement.executeQuery()) { - while (set.next()) { - UUID uuid = UUID.fromString(set.getString("player")); - int rating = set.getInt("rating"); + try (ResultSet resultSet = statement.executeQuery()) { + while (resultSet.next()) { + UUID uuid = UUID.fromString(resultSet.getString("player")); + int rating = resultSet.getInt("rating"); map.put(uuid, rating); } } @@ -2526,7 +2518,7 @@ public class SQLManager implements AbstractDB { for (String areaKey : areaSection.getKeys(false)) { String[] split = areaKey.split("(? set = newClusters.get(areaid); + if (set == null) { + set = new HashSet<>(); + newClusters.put(areaid, set); + } + set.add(cluster); } - owner = r.getString("owner"); - user = uuids.get(owner); - if (user == null) { - user = UUID.fromString(owner); - uuids.put(owner, user); - } - cluster = new PlotCluster(null, pos1, pos2, user, id); - clusters.put(id, cluster); - Set set = newClusters.get(areaid); - if (set == null) { - set = new HashSet<>(); - newClusters.put(areaid, set); - } - set.add(cluster); - } /* * Getting helpers */ - r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`"); - while (r.next()) { - id = r.getInt("cluster_id"); - owner = r.getString("user_uuid"); - user = uuids.get(owner); - if (user == null) { - user = UUID.fromString(owner); - uuids.put(owner, user); + resultSet = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`"); + while (resultSet.next()) { + id = resultSet.getInt("cluster_id"); + owner = resultSet.getString("user_uuid"); + user = uuids.get(owner); + if (user == null) { + user = UUID.fromString(owner); + uuids.put(owner, user); + } + cluster = clusters.get(id); + if (cluster != null) { + cluster.helpers.add(user); + } else { + PS.debug("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry."); + } } - cluster = clusters.get(id); - if (cluster != null) { - cluster.helpers.add(user); - } else { - PS.debug("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry."); - } - } /* * Getting invited */ - r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`"); - while (r.next()) { - id = r.getInt("cluster_id"); - owner = r.getString("user_uuid"); - user = uuids.get(owner); - if (user == null) { - user = UUID.fromString(owner); - uuids.put(owner, user); - } - cluster = clusters.get(id); - if (cluster != null) { - cluster.invited.add(user); - } else { - PS.debug("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry."); - } - } - r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`"); - while (r.next()) { - id = r.getInt("cluster_id"); - cluster = clusters.get(id); - if (cluster != null) { - String alias = r.getString("alias"); - if (alias != null) { - cluster.settings.setAlias(alias); + resultSet = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`"); + while (resultSet.next()) { + id = resultSet.getInt("cluster_id"); + owner = resultSet.getString("user_uuid"); + user = uuids.get(owner); + if (user == null) { + user = UUID.fromString(owner); + uuids.put(owner, user); } - String pos = r.getString("position"); - switch (pos.toLowerCase()) { - case "": - case "default": - case "0,0,0": - case "center": - break; - default: - try { - BlockLoc loc = BlockLoc.fromString(pos); - cluster.settings.setPosition(loc); - } catch (Exception ignored) { - } - } - Integer m = r.getInt("merged"); - boolean[] merged = new boolean[4]; - for (int i = 0; i < 4; i++) { - merged[3 - i] = (m & 1 << i) != 0; - } - cluster.settings.setMerged(merged); - String[] flags_string; - String myflags = r.getString("flags"); - if (myflags == null) { - flags_string = new String[]{}; + cluster = clusters.get(id); + if (cluster != null) { + cluster.invited.add(user); } else { - if (!myflags.isEmpty()) { - flags_string = myflags.split(","); - } else { - flags_string = new String[]{}; - } + PS.debug("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry."); } - HashMap, Object> flags = new HashMap<>(); - boolean exception = false; - for (String element : flags_string) { - if (element.contains(":")) { - String[] split = element.split(":"); - try { - String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("�", ","); - Flag flag = FlagManager.getFlag(split[0]); - flags.put(flag, flag_str); - } catch (Exception e) { - e.printStackTrace(); - exception = true; - } - } else { - Flag flag = FlagManager.getFlag(element); - flags.put(flag, ""); - } - } - if (exception) { - PS.debug("&cCluster " + id + " had an invalid flag. A fix has been attempted."); - PS.debug("&c" + myflags); - } - cluster.settings.flags = flags; - } else { - PS.debug("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry."); } + resultSet = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`"); + while (resultSet.next()) { + id = resultSet.getInt("cluster_id"); + cluster = clusters.get(id); + if (cluster != null) { + String alias = resultSet.getString("alias"); + if (alias != null) { + cluster.settings.setAlias(alias); + } + String pos = resultSet.getString("position"); + switch (pos.toLowerCase()) { + case "": + case "default": + case "0,0,0": + case "center": + break; + default: + try { + BlockLoc loc = BlockLoc.fromString(pos); + cluster.settings.setPosition(loc); + } catch (Exception ignored) { + } + } + Integer m = resultSet.getInt("merged"); + boolean[] merged = new boolean[4]; + for (int i = 0; i < 4; i++) { + merged[3 - i] = (m & 1 << i) != 0; + } + cluster.settings.setMerged(merged); + String[] flags_string; + String myflags = resultSet.getString("flags"); + if (myflags == null || myflags.isEmpty()) { + flags_string = new String[]{}; + } else { + flags_string = myflags.split(","); + } + HashMap, Object> flags = new HashMap<>(); + boolean exception = false; + for (String element : flags_string) { + if (element.contains(":")) { + String[] split = element.split(":"); + try { + String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("�", ","); + Flag flag = FlagManager.getFlag(split[0]); + flags.put(flag, flag.parseValue(flag_str)); + } catch (Exception e) { + e.printStackTrace(); + exception = true; + } + } else { + Flag flag = FlagManager.getFlag(element); + flags.put(flag, flag.parseValue("")); + } + } + if (exception) { + PS.debug("&cCluster " + id + " had an invalid flag. A fix has been attempted."); + PS.debug("&c" + myflags); + } + cluster.settings.flags = flags; + } else { + PS.debug("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry."); + } + } + resultSet.close(); } - stmt.close(); - r.close(); boolean invalidPlot = false; for (Entry entry : noExist.entrySet()) { String a = entry.getKey(); @@ -2700,10 +2688,11 @@ public class SQLManager implements AbstractDB { int i = 0; for (Entry, Object> flag : flags.entrySet()) { if (i != 0) { - flag_string.append(","); + flag_string.append(','); } - flag_string.append(flag.getKey().getName() + ":" + flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯").replaceAll(",", - "´")); + flag_string.append(flag.getKey().getName()).append(":") + .append(flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯").replaceAll(",", + "´")); i++; } addClusterTask(cluster, new UniqueStatement("setFlags") { @@ -2793,15 +2782,15 @@ public class SQLManager implements AbstractDB { @Override public void execute(PreparedStatement statement) { - } @Override public void addBatch(PreparedStatement statement) throws SQLException { statement.executeUpdate(); - ResultSet keys = statement.getGeneratedKeys(); - if (keys.next()) { - cluster.temp = keys.getInt(1); + try (ResultSet keys = statement.getGeneratedKeys()) { + if (keys.next()) { + cluster.temp = keys.getInt(1); + } } } }); @@ -3038,12 +3027,10 @@ public class SQLManager implements AbstractDB { } for (Entry> entry : database.entrySet()) { - String worldname = entry.getKey(); HashMap map = entry.getValue(); if (!map.isEmpty()) { for (Entry entry2 : map.entrySet()) { - Plot plot = entry2.getValue(); - PS.debug("$1Plot was deleted: " + entry2.getValue() + "// TODO implement this when sure safe"); + PS.debug("$1Plot was deleted: " + entry2.getValue().toString() + "// TODO implement this when sure safe"); } } } @@ -3112,30 +3099,30 @@ public class SQLManager implements AbstractDB { try (Statement stmt = SQLManager.this.connection.createStatement()) { stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() - + "'"); + + '\''); stmt.executeUpdate( "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() - + "'"); + + '\''); } catch (SQLException e) { e.printStackTrace(); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java index a1460fd5b..388b96eb8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/database/SQLite.java @@ -39,7 +39,7 @@ public class SQLite extends Database { if (!file.exists()) { try { file.createNewFile(); - } catch (IOException e) { + } catch (IOException ignored) { PS.debug("&cUnable to create database!"); } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java b/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java index 697417e34..4bd455965 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java @@ -12,9 +12,9 @@ public abstract class StmtMod { public String getCreateMySQL(int size, String query, int params) { StringBuilder statement = new StringBuilder(query); for (int i = 0; i < size - 1; i++) { - statement.append("(").append(StringMan.repeat(",?", params).substring(1)).append("),"); + statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append("),"); } - statement.append("(").append(StringMan.repeat(",?", params).substring(1)).append(")"); + statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append(')'); return statement.toString(); } @@ -22,7 +22,7 @@ public abstract class StmtMod { StringBuilder statement = new StringBuilder(query); String modParams = StringMan.repeat(",?", params).substring(1); for (int i = 0; i < size - 1; i++) { - statement.append("UNION SELECT ").append(modParams).append(" "); + statement.append("UNION SELECT ").append(modParams).append(' '); } return statement.toString(); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java index 02f7d3b21..efcd0c58e 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/flag/Flag.java @@ -2,7 +2,7 @@ package com.intellectualcrafters.plot.flag; public class Flag { - private String name; + private final String name; /** * Flag object used to store basic information for a Plot. Flags are a diff --git a/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java index 441bdd817..15dd548b9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/generator/AugmentedUtils.java @@ -127,9 +127,8 @@ public class AugmentedUtils { } if (!has) { continue; - } else { - toReturn = true; } + toReturn = true; secondaryMask = new PlotChunk(wrap) { @Override public Object getChunkAbs() { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java index b427c7abe..3fe67531d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java @@ -2,6 +2,7 @@ package com.intellectualcrafters.plot.object; import com.google.common.base.Optional; import com.google.common.collect.BiMap; +import com.google.common.collect.ImmutableSet; import com.intellectualcrafters.jnbt.CompoundTag; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; @@ -212,19 +213,19 @@ public class Plot { String[] split = string.split(";|,"); if (split.length == 2) { if (defaultArea != null) { - PlotId id = PlotId.fromString(split[0] + ";" + split[1]); + PlotId id = PlotId.fromString(split[0] + ';' + split[1]); return id != null ? defaultArea.getPlotAbs(id) : null; } } else if (split.length == 3) { PlotArea pa = PS.get().getPlotArea(split[0], null); if (pa != null) { - PlotId id = PlotId.fromString(split[1] + ";" + split[2]); + PlotId id = PlotId.fromString(split[1] + ';' + split[2]); return pa.getPlotAbs(id); } } else if (split.length == 4) { PlotArea pa = PS.get().getPlotArea(split[0], split[1]); if (pa != null) { - PlotId id = PlotId.fromString(split[1] + ";" + split[2]); + PlotId id = PlotId.fromString(split[1] + ';' + split[2]); return pa.getPlotAbs(id); } } @@ -348,17 +349,17 @@ public class Plot { } /** - * Get a list of owner UUIDs for a plot (supports multi-owner mega-plots). + * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots). * @return */ - public HashSet getOwners() { + public Set getOwners() { if (this.owner == null) { return new HashSet<>(); } if (isMerged()) { HashSet plots = getConnectedPlots(); Plot[] array = plots.toArray(new Plot[plots.size()]); - HashSet owners = new HashSet(1); + ImmutableSet.Builder owners = ImmutableSet.builder(); UUID last = this.owner; owners.add(this.owner); for (Plot current : array) { @@ -367,9 +368,9 @@ public class Plot { last = current.owner; } } - return owners; + return owners.build(); } - return new HashSet<>(Collections.singletonList(this.owner)); + return ImmutableSet.of(this.owner); } /** @@ -380,10 +381,7 @@ public class Plot { * @return true if the player is added/trusted or is the owner */ public boolean isAdded(UUID uuid) { - if (this.owner == null) { - return false; - } - if (getDenied().contains(uuid)) { + if (this.owner == null || getDenied().contains(uuid)) { return false; } if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.everyone)) { @@ -1742,7 +1740,7 @@ public class Plot { TaskManager.runTaskAsync(new Runnable() { @Override public void run() { - String name = Plot.this.id + "," + Plot.this.area + "," + MainUtil.getName(Plot.this.owner); + String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil.getName(Plot.this.owner); boolean result = SchematicHandler.manager.save(value, Settings.SCHEMATIC_SAVE_PATH + File.separator + name + ".schematic"); if (whenDone != null) { @@ -2034,7 +2032,7 @@ public class Plot { this.create(); } return this.owner; - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException ignored) { return null; } } @@ -2576,16 +2574,15 @@ public class Plot { return; } TaskManager.TELEPORT_QUEUE.remove(name); - if (!player.isOnline()) { - return; + if (player.isOnline()) { + MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT); + player.teleport(location); } - MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT); - player.teleport(location); } }, Settings.TELEPORT_DELAY * 20); return true; } - return result; + return false; } public boolean isOnline() { @@ -2876,6 +2873,7 @@ public class Plot { } public boolean hasFlag(Flag flag) { + //todo return false; } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java index 6a34c0b01..4336de754 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java @@ -515,7 +515,7 @@ public class PlotAnalysis { int SIZE = 10; List[] bucket = new ArrayList[SIZE]; for (int i = 0; i < bucket.length; i++) { - bucket[i] = new ArrayList(); + bucket[i] = new ArrayList<>(); } boolean maxLength = false; int placement = 1; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java index cfd7f757a..6fb59513c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java @@ -1,6 +1,6 @@ package com.intellectualcrafters.plot.object; -import java.util.HashSet; +import java.util.Set; import java.util.UUID; public class PlotHandler { @@ -8,7 +8,7 @@ public class PlotHandler { if ((plot1.owner == null) || (plot2.owner == null)) { return false; } - final HashSet owners = plot1.getOwners(); + final Set owners = plot1.getOwners(); owners.retainAll(plot2.getOwners()); return !owners.isEmpty(); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java index ad61abf25..b8a60edc4 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java @@ -245,19 +245,6 @@ public abstract class PlotPlayer implements CommandCaller { */ public abstract UUID getUUID(); - /** - * Check the player's permissions
- * - Will be cached if permission caching is enabled - */ - @Override - public abstract boolean hasPermission(String permission); - - /** - * Send the player a message - */ - @Override - public abstract void sendMessage(String message); - /** * Teleport the player to a location * @param location diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java b/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java index 14c8318f6..7930b6c24 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java @@ -254,7 +254,7 @@ public class BO3Handler { try (FileOutputStream fos = new FileOutputStream(bo3File)) { write(fos, plot, bo3); } - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); return false; } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java index f5ef72336..0019882ca 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java @@ -20,6 +20,7 @@ import com.intellectualcrafters.plot.object.RegionWrapper; import com.intellectualcrafters.plot.object.RunnableVal; import java.io.File; +import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; @@ -125,7 +126,7 @@ public class MainUtil { filename = "plot." + extension; } else { website = Settings.WEB_URL + "save.php?" + uuid; - filename = file + "." + extension; + filename = file + '.' + extension; } final URL url; try { @@ -183,7 +184,7 @@ public class MainUtil { whenDone.value = url; } TaskManager.runTask(whenDone); - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); TaskManager.runTask(whenDone); } @@ -298,7 +299,8 @@ public class MainUtil { public static String getName(UUID owner) { if (owner == null) { return C.NONE.s(); - } else if (owner.equals(DBFunc.everyone)) { + } + if (owner.equals(DBFunc.everyone)) { return C.EVERYONE.s(); } String name = UUIDHandler.getName(owner); @@ -365,7 +367,7 @@ public class MainUtil { uuid = UUID.fromString(term); } uuids.add(uuid); - } catch (Exception e) { + } catch (Exception ignored) { id = PlotId.fromString(term); if (id != null) { continue; @@ -772,20 +774,20 @@ public class MainUtil { } String info; if (full && Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) { - String rating = ""; - String prefix = ""; double[] ratings = MainUtil.getAverageRatings(plot); for (double v : ratings) { } + String rating = ""; + String prefix = ""; for (int i = 0; i < ratings.length; i++) { - rating += prefix + Settings.RATING_CATEGORIES.get(i) + "=" + String.format("%.1f", ratings[i]); + rating += prefix + Settings.RATING_CATEGORIES.get(i) + '=' + String.format("%.1f", ratings[i]); prefix = ","; } info = newInfo.replaceAll("%rating%", rating); } else { - info = newInfo.replaceAll("%rating%", String.format("%.1f", plot.getAverageRating()) + "/" + max); + info = newInfo.replaceAll("%rating%", String.format("%.1f", plot.getAverageRating()) + '/' + max); } whenDone.run(info); } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java b/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java index 64270ae3c..6e9c67833 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/MathMan.java @@ -115,7 +115,7 @@ public class MathMan { } public static double sqrtApprox(double d) { - return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1l << 52)) >> 1) + (1l << 61)); + return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61)); } public static float invSqrt(float x) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java b/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java index 462154b21..9275179a8 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java @@ -27,8 +27,8 @@ public class ReflectionUtils { public ReflectionUtils(String version) { if (version != null) { - preClassB += "." + version; - preClassM += "." + version; + preClassB += '.' + version; + preClassM += '.' + version; } } @@ -73,29 +73,29 @@ public class ReflectionUtils { } catch (ClassCastException ignored) { } } - } catch (Throwable e) { + } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) { e.printStackTrace(); } return list; } public static Class getNmsClass(String name) { - String className = preClassM + "." + name; + String className = preClassM + '.' + name; return getClass(className); } public static Class getCbClass(String name) { - String className = preClassB + "." + name; + String className = preClassB + '.' + name; return getClass(className); } public static Class getUtilClass(String name) { try { return Class.forName(name); //Try before 1.8 first - } catch (ClassNotFoundException ex) { + } catch (ClassNotFoundException ignored) { try { return Class.forName("net.minecraft.util." + name); //Not 1.8 - } catch (ClassNotFoundException ex2) { + } catch (ClassNotFoundException ignored2) { return null; } } @@ -110,9 +110,9 @@ public class ReflectionUtils { public static Method makeMethod(Class clazz, String methodName, Class... paramaters) { try { return clazz.getDeclaredMethod(methodName, paramaters); - } catch (NoSuchMethodException ex) { + } catch (NoSuchMethodException ignored) { return null; - } catch (Exception ex) { + } catch (SecurityException ex) { throw new RuntimeException(ex); } } @@ -127,7 +127,7 @@ public class ReflectionUtils { return (T) method.invoke(instance, paramaters); } catch (InvocationTargetException ex) { throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { + } catch (IllegalAccessException | IllegalArgumentException ex) { throw new RuntimeException(ex); } } @@ -136,9 +136,9 @@ public class ReflectionUtils { public static Constructor makeConstructor(Class clazz, Class... paramaterTypes) { try { return (Constructor) clazz.getConstructor(paramaterTypes); - } catch (NoSuchMethodException ex) { + } catch (NoSuchMethodException ignored) { return null; - } catch (Exception ex) { + } catch (SecurityException ex) { throw new RuntimeException(ex); } } @@ -152,7 +152,7 @@ public class ReflectionUtils { return constructor.newInstance(paramaters); } catch (InvocationTargetException ex) { throw new RuntimeException(ex.getCause()); - } catch (Exception ex) { + } catch (IllegalAccessException | IllegalArgumentException | InstantiationException ex) { throw new RuntimeException(ex); } } @@ -160,9 +160,9 @@ public class ReflectionUtils { public static Field makeField(Class clazz, String name) { try { return clazz.getDeclaredField(name); - } catch (NoSuchFieldException ex) { + } catch (NoSuchFieldException ignored) { return null; - } catch (Exception ex) { + } catch (SecurityException ex) { throw new RuntimeException(ex); } } @@ -175,7 +175,7 @@ public class ReflectionUtils { field.setAccessible(true); try { return (T) field.get(instance); - } catch (Exception ex) { + } catch (IllegalAccessException | IllegalArgumentException ex) { throw new RuntimeException(ex); } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java index 4137b330b..572b17319 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java @@ -577,6 +577,8 @@ public abstract class SchematicHandler { try (OutputStream stream = new FileOutputStream(tmp); NBTOutputStream output = new NBTOutputStream(new GZIPOutputStream(stream))) { output.writeTag(tag); } + } catch (FileNotFoundException e) { + e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); return false; diff --git a/Core/src/main/java/com/plotsquared/general/commands/Command.java b/Core/src/main/java/com/plotsquared/general/commands/Command.java index 97fd00cfa..31acf7791 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/Command.java +++ b/Core/src/main/java/com/plotsquared/general/commands/Command.java @@ -253,7 +253,7 @@ public abstract class Command { return; } if (page == 0 && totalPages != 0) { // Next - new PlotMessage().text("<-").color("$3").text(" | ").color("$3").text("->").color("$1").command(baseCommand + " " + (page + 2)) + new PlotMessage().text("<-").color("$3").text(" | ").color("$3").text("->").color("$1").command(baseCommand + " " + (0 + 2)) .text(C.CLICKABLE.s()).color("$2").send(player); return; } diff --git a/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java b/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java index fba200cf1..314b7250f 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java +++ b/Core/src/main/java/com/plotsquared/general/commands/CommandCaller.java @@ -4,8 +4,14 @@ import com.intellectualcrafters.plot.commands.RequiredType; public interface CommandCaller { + /** + * Send the player a message. + */ void sendMessage(String message); + /** + * Check the player's permissions. Will be cached if permission caching is enabled. + */ boolean hasPermission(String perm); RequiredType getSuperCaller(); diff --git a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java index 850c94021..ecda7b943 100644 --- a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java @@ -123,11 +123,10 @@ public class WESubscriber { if (maskextent != null) { wrapper = new ExtentWrapper(maskextent); field.set(maskextent, history); - event.setExtent(wrapper); } else { wrapper = new ExtentWrapper(history); - event.setExtent(wrapper); } + event.setExtent(wrapper); field.set(history, reorder); field.set(reorder, new ProcessedWEExtent(world, mask, max, new FastModeExtent(worldObj, true), wrapper)); } diff --git a/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java b/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java index 48df1167d..e1d2d1078 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java +++ b/Core/src/test/java/com/intellectualcrafters/plot/FlagTest.java @@ -3,7 +3,7 @@ package com.intellectualcrafters.plot; import static org.junit.Assert.assertEquals; import com.google.common.base.Optional; -import com.intellectualcrafters.plot.database.AbstractDBTEst; +import com.intellectualcrafters.plot.database.AbstractDBTest; import com.intellectualcrafters.plot.database.DBFunc; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.Flags; @@ -27,7 +27,7 @@ public class FlagTest { @Before public void setUp() throws Exception { EventUtil.manager = new EventUtilTest(); - DBFunc.dbManager = new AbstractDBTEst(); + DBFunc.dbManager = new AbstractDBTest(); } @Test diff --git a/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTEst.java b/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTEst.java index d94661796..c04f69238 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTEst.java +++ b/Core/src/test/java/com/intellectualcrafters/plot/database/AbstractDBTEst.java @@ -15,70 +15,54 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -public class AbstractDBTEst implements AbstractDB { +public class AbstractDBTest implements AbstractDB { @Override public void setOwner(Plot plot, UUID uuid) { - } @Override public void createPlotsAndData(ArrayList plots, Runnable whenDone) { - } @Override public void createPlot(Plot plot) { - } - @Override public void createTables() throws Exception { - + @Override public void createTables() { } @Override public void delete(Plot plot) { - } @Override public void deleteSettings(Plot plot) { - } @Override public void deleteHelpers(Plot plot) { - } @Override public void deleteTrusted(Plot plot) { - } @Override public void deleteDenied(Plot plot) { - } @Override public void deleteComments(Plot plot) { - } @Override public void deleteRatings(Plot plot) { - } @Override public void delete(PlotCluster cluster) { - } @Override public void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete) { - } @Override public void removePersistentMeta(UUID uuid, String key) { - } @Override public void getPersistentMeta(UUID uuid, RunnableVal> result) { - } @Override public void createPlotSettings(int id, Plot plot) { - } @Override public int getId(Plot plot) { @@ -94,7 +78,6 @@ public class AbstractDBTEst implements AbstractDB { } @Override public void validateAllPlots(Set toValidate) { - } @Override public HashMap> getClusters() { @@ -102,83 +85,63 @@ public class AbstractDBTEst implements AbstractDB { } @Override public void setMerged(Plot plot, boolean[] merged) { - } @Override public void swapPlots(Plot plot1, Plot plot2) { - } @Override public void setFlags(Plot plot, HashMap, Object> flags) { - } @Override public void setFlags(PlotCluster cluster, HashMap, Object> flags) { - } @Override public void setClusterName(PlotCluster cluster, String name) { - } @Override public void setAlias(Plot plot, String alias) { - } @Override public void purgeIds(Set uniqueIds) { - } @Override public void purge(PlotArea area, Set plotIds) { - } @Override public void setPosition(Plot plot, String position) { - } @Override public void setPosition(PlotCluster cluster, String position) { - } @Override public void removeTrusted(Plot plot, UUID uuid) { - } @Override public void removeHelper(PlotCluster cluster, UUID uuid) { - } @Override public void removeMember(Plot plot, UUID uuid) { - } @Override public void removeInvited(PlotCluster cluster, UUID uuid) { - } @Override public void setTrusted(Plot plot, UUID uuid) { - } @Override public void setHelper(PlotCluster cluster, UUID uuid) { - } @Override public void setMember(Plot plot, UUID uuid) { - } @Override public void setInvited(PlotCluster cluster, UUID uuid) { - } @Override public void removeDenied(Plot plot, UUID uuid) { - } @Override public void setDenied(Plot plot, UUID uuid) { - } @Override public HashMap getRatings(Plot plot) { @@ -186,43 +149,33 @@ public class AbstractDBTEst implements AbstractDB { } @Override public void setRating(Plot plot, UUID rater, int value) { - } @Override public void removeComment(Plot plot, PlotComment comment) { - } @Override public void clearInbox(Plot plot, String inbox) { - } @Override public void setComment(Plot plot, PlotComment comment) { - } @Override public void getComments(Plot plot, String inbox, RunnableVal> whenDone) { - } @Override public void createPlotAndSettings(Plot plot, Runnable whenDone) { - } @Override public void createCluster(PlotCluster cluster) { - } @Override public void resizeCluster(PlotCluster current, PlotId min, PlotId max) { - } @Override public void movePlot(Plot originalPlot, Plot newPlot) { - } @Override public void replaceUUID(UUID old, UUID now) { - } @Override public boolean deleteTables() { @@ -230,14 +183,11 @@ public class AbstractDBTEst implements AbstractDB { } @Override public void close() { - } @Override public void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) { - } @Override public void updateTables(int[] oldVersion) { - } } diff --git a/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java b/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java index 2d2c37fe4..88d26c1ed 100644 --- a/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java +++ b/Core/src/test/java/com/intellectualcrafters/plot/util/EventUtilTest.java @@ -31,7 +31,6 @@ public class EventUtilTest extends EventUtil { } @Override public void callDelete(Plot plot) { - } @Override public boolean callFlagAdd(Flag flag, Plot plot) { @@ -55,22 +54,17 @@ public class EventUtilTest extends EventUtil { } @Override public void callEntry(PlotPlayer player, Plot plot) { - } @Override public void callLeave(PlotPlayer player, Plot plot) { - } @Override public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) { - } @Override public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) { - } @Override public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) { - } } \ No newline at end of file diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java index 04dda11f0..4f92abd6a 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java @@ -182,7 +182,7 @@ public class MainListener { } @Listener - public void onSpawnEntity(SpawnEntityEvent event) throws Exception { + public void onSpawnEntity(SpawnEntityEvent event) { World world = event.getTargetWorld(); event.filterEntities(entity -> { if (entity instanceof Player) { @@ -283,7 +283,7 @@ public class MainListener { }); } - public void onNotifyNeighborBlock(NotifyNeighborBlockEvent event) throws Exception { + public void onNotifyNeighborBlock(NotifyNeighborBlockEvent event) { AtomicBoolean cancelled = new AtomicBoolean(false); // SpongeUtil.printCause("physics", event.getCause()); // PlotArea area = plotloc.getPlotArea(); @@ -320,7 +320,7 @@ public class MainListener { } @Listener - public void onInteract(InteractEvent event) throws Exception { + public void onInteract(InteractEvent event) { Player player = SpongeUtil.getCause(event.getCause(), Player.class); if (player == null) { event.setCancelled(true); @@ -366,7 +366,7 @@ public class MainListener { } @Listener - public void onExplosion(ExplosionEvent e) throws Exception { + public void onExplosion(ExplosionEvent e) { if (e instanceof ExplosionEvent.Detonate) { ExplosionEvent.Detonate event = (Detonate) e; World world = event.getTargetWorld(); diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java index 8ef386fc1..a4628e409 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java @@ -3,7 +3,6 @@ package com.plotsquared.sponge.util; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.AbstractTitle; import com.plotsquared.sponge.object.SpongePlayer; -import org.spongepowered.api.text.Text; import org.spongepowered.api.text.title.Title; public class SpongeTitleManager extends AbstractTitle { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/block/SlowQueue.java b/Sponge/src/main/java/com/plotsquared/sponge/util/block/SlowQueue.java index bc7f804da..0c4aa5cfa 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/block/SlowQueue.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/block/SlowQueue.java @@ -116,7 +116,6 @@ public class SlowQueue implements PlotQueue { IChunkProvider provider = nmsWorld.getChunkProvider(); if (!(provider instanceof ChunkProviderServer)) { PS.debug("Not valid world generator for: " + world); - return; } /* ChunkProviderServer chunkServer = (ChunkProviderServer) provider; IChunkProvider chunkProvider = chunkServer.serverChunkGenerator; diff --git a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java b/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java index 905c9fee3..fe45ed968 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java @@ -8,6 +8,7 @@ import com.plotsquared.sponge.SpongeMain; import com.plotsquared.sponge.object.SpongePlayer; import java.util.UUID; +import java.util.concurrent.ExecutionException; public class SpongeOnlineUUIDWrapper extends UUIDWrapper { @@ -36,7 +37,7 @@ public class SpongeOnlineUUIDWrapper extends UUIDWrapper { String name; try { name = SpongeMain.THIS.getResolver().get(uuid, true).get().getName().orElse(null); - } catch (final Exception e) { + } catch (InterruptedException | ExecutionException ignored) { name = null; } final String username = name;