diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 21876b376..026ddc5bc 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':Core') compile 'org.bukkit:bukkit:1.9-R0.1-SNAPSHOT' compile 'org.mcstats.bukkit:metrics:R7' - compile 'net.milkbowl.vault:VaultAPI:1.5' + compile 'net.milkbowl.vault:VaultAPI:1.6' } sourceCompatibility = 1.7 diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index b175b5377..9f7f03251 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -111,11 +111,11 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain if (split.length == 3) { this.version[2] = Integer.parseInt(split[2]); } - } catch (Exception e) { + } catch (NumberFormatException e) { e.printStackTrace(); PS.debug(StringMan.getString(Bukkit.getBukkitVersion())); PS.debug(StringMan.getString(Bukkit.getBukkitVersion().split("-")[0].split("\\."))); - return new int[]{1,9,2}; + return new int[]{1, 9, 2}; } } return this.version; @@ -202,10 +202,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } List entities = world.getEntities(); Iterator iterator = entities.iterator(); - for (Entity entity : entities) { - - } - while (iterator.hasNext()) { Entity entity = iterator.next(); switch (entity.getType()) { @@ -593,7 +589,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain if (!PS.get().hasPlotArea(worldName)) { SetGenCB.setGenerator(BukkitUtil.getWorld(worldName)); } - } catch (Exception e) { + } catch (Exception ignored) { log("Failed to reload world: " + world); Bukkit.getServer().unloadWorld(world, false); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java index 3d3ab8efd..f3cd5454f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java @@ -464,7 +464,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< Reflection.getMethod(Reflection.getOBCClass("inventory.CraftItemStack"), "asNMSCopy", ItemStack.class).invoke(null, itemStack); return itemTooltip(Reflection.getMethod(Reflection.getNMSClass("ItemStack"), "save", Reflection.getNMSClass("NBTTagCompound")) .invoke(nmsItem, Reflection.getNMSClass("NBTTagCompound").newInstance()).toString()); - } catch (Exception e) { + } catch (IllegalAccessException | IllegalArgumentException | InstantiationException | InvocationTargetException e) { e.printStackTrace(); return this; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java index bdf5ae099..716b37530 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java @@ -121,7 +121,7 @@ public class DebugUUID extends SubCommand { try { UUID uuid = UUID.fromString(s); uuids.add(uuid); - } catch (Exception e) { + } catch (Exception ignored) { MainUtil.sendMessage(player, C.PREFIX + "Invalid playerdata: " + current); } } @@ -152,7 +152,7 @@ public class DebugUUID extends SubCommand { uCMap.put(uuid, uuid2); uCReverse.put(uuid2, uuid); } - } catch (Throwable e) { + } catch (Throwable ignored) { MainUtil.sendMessage(player, C.PREFIX + "&6Invalid playerdata: " + uuid.toString() + ".dat"); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java index 076754b39..ba61f6c89 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java @@ -5,11 +5,13 @@ import org.bukkit.Art; import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.Rotation; +import org.bukkit.TreeSpecies; import org.bukkit.World; import org.bukkit.block.BlockFace; import org.bukkit.entity.Ageable; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Bat; +import org.bukkit.entity.Boat; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -35,25 +37,25 @@ import org.bukkit.util.Vector; public class EntityWrapper { - public final EntityType type; - public final float yaw; - public final float pitch; - public final short depth; + private final EntityType type; + private final float yaw; + private final float pitch; + private final short depth; private final int hash; private final EntityBaseStats base = new EntityBaseStats(); public double x; public double y; public double z; - // Extended - public ItemStack stack; public ItemStack[] inventory; - public byte dataByte; - public byte dataByte2; - public String dataString; - public LivingEntityStats lived; - public AgeableStats aged; - public TameableStats tamed; - ArmorStandStats stand; + // Extended + private ItemStack stack; + private byte dataByte; + private byte dataByte2; + private String dataString; + private LivingEntityStats lived; + private AgeableStats aged; + private TameableStats tamed; + private ArmorStandStats stand; private HorseStats horse; public EntityWrapper(Entity entity, short depth) { @@ -86,6 +88,10 @@ public class EntityWrapper { switch (entity.getType()) { case ARROW: case BOAT: + if (PS.get().checkVersion(PS.get().IMP.getServerVersion(), 1, 9, 0)) { + Boat boat = (Boat) entity; + this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType()); + } case COMPLEX_PART: case EGG: case ENDER_CRYSTAL: @@ -459,7 +465,7 @@ public class EntityWrapper { if (this.base.passenger != null) { try { entity.setPassenger(this.base.passenger.spawn(world, x_offset, z_offset)); - } catch (Exception e) { + } catch (Exception ignored) { } } if (this.base.fall != 0) { @@ -478,6 +484,11 @@ public class EntityWrapper { switch (entity.getType()) { case ARROW: case BOAT: + if (PS.get().checkVersion(PS.get().IMP.getServerVersion(), 1, 9, 0)) { + Boat boat = (Boat) entity; + boat.setWoodType(TreeSpecies.values()[dataByte]); + } + case COMPLEX_PART: case EGG: case ENDER_CRYSTAL: @@ -706,4 +717,10 @@ public class EntityWrapper { } return 0; } + + @SuppressWarnings("deprecation") + @Override + public String toString() { + return String.format("[%s, x=%s, y=%s, z=%s]", type.getName(), x, y, z); + } } 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 f9f76c85e..e181810f8 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java @@ -388,10 +388,12 @@ public class BukkitChunkManager extends ChunkManager { return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(force); } + @SuppressWarnings("deprecation") @Override public void unloadChunk(final String world, final ChunkLoc loc, final boolean save, final boolean safe) { if (!PS.get().isMainThread(Thread.currentThread())) { TaskManager.runTask(new Runnable() { + @SuppressWarnings("deprecation") @Override public void run() { BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe); @@ -722,7 +724,7 @@ public class BukkitChunkManager extends ChunkManager { try { entity.spawn(world, xOffset, zOffset); } catch (Exception e) { - PS.debug("Failed to restore entity (e): " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.type); + PS.debug("Failed to restore entity (e): " + e.toString()); e.printStackTrace(); } } @@ -743,7 +745,7 @@ public class BukkitChunkManager extends ChunkManager { PS.debug("&c[WARN] Plot clear failed to regenerate chest: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { + } 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)); } @@ -786,7 +788,7 @@ public class BukkitChunkManager extends ChunkManager { PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { + } 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)); } @@ -803,7 +805,7 @@ public class BukkitChunkManager extends ChunkManager { PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { + } 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)); } @@ -820,7 +822,7 @@ public class BukkitChunkManager extends ChunkManager { PS.debug("&c[WARN] Plot clear failed to regenerate beacon: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { + } 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)); } @@ -840,7 +842,7 @@ public class BukkitChunkManager extends ChunkManager { .getKey().y + "," + ( blockLocMaterialEntry.getKey().z + zOffset)); } - } catch (Exception e) { + } catch (Exception ignored) { PS.debug("&c[WARN] Plot clear failed to regenerate jukebox (e): " + (blockLocMaterialEntry.getKey().x + xOffset) + "," + blockLocMaterialEntry .getKey().y + "," + ( @@ -882,7 +884,7 @@ public class BukkitChunkManager extends ChunkManager { PS.debug("&c[WARN] Plot clear failed to regenerate hopper: " + (blockLocEntry.getKey().x + xOffset) + "," + blockLocEntry .getKey().y + "," + (blockLocEntry.getKey().z + zOffset)); } - } catch (IllegalArgumentException e) { + } 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)); } @@ -901,7 +903,7 @@ public class BukkitChunkManager extends ChunkManager { .getKey().y + "," + ( blockLocNoteEntry.getKey().z + zOffset)); } - } catch (Exception e) { + } catch (Exception ignored) { PS.debug("&c[WARN] Plot clear failed to regenerate note block (e): " + (blockLocNoteEntry.getKey().x + xOffset) + "," + blockLocNoteEntry .getKey().y + "," + ( @@ -921,7 +923,7 @@ public class BukkitChunkManager extends ChunkManager { .getKey().y + "," + ( blockLocShortEntry.getKey().z + zOffset)); } - } catch (Exception e) { + } 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)); } @@ -1060,7 +1062,11 @@ public class BukkitChunkManager extends ChunkManager { Material id = block.getType(); if (storeNormal) { int typeId = id.getId(); - ids[y] = new PlotBlock((short) typeId, typeId == 0 ? 0 : block.getData()); + if (typeId == 0) { + ids[y] = PlotBlock.EVERYTHING; + } else { + ids[y] = new PlotBlock((short) typeId, block.getData()); + } } if (!id.equals(Material.AIR)) { try { 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 59a500efd..13a559d9c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -12,8 +12,6 @@ import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.UUIDHandler; import com.intellectualcrafters.plot.util.WorldUtil; import com.plotsquared.bukkit.object.BukkitPlayer; -import java.util.Arrays; -import java.util.List; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -34,6 +32,9 @@ import org.bukkit.material.Tree; import org.bukkit.material.WoodenStep; import org.bukkit.material.Wool; +import java.util.Arrays; +import java.util.List; + public class BukkitUtil extends WorldUtil { private static String lastString = null; @@ -260,7 +261,7 @@ public class BukkitUtil extends WorldUtil { public String getClosestMatchingName(PlotBlock block) { try { return Material.getMaterial(block.id).name(); - } catch (Exception e) { + } catch (Exception ignored) { return null; } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java index ec7764bc9..bf365ac73 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/NbtFactory.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.AbstractList; @@ -314,7 +315,7 @@ public class NbtFactory { private static Object invokeMethod(Method method, Object target, Object... params) { try { return method.invoke(target, params); - } catch (Exception e) { + } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new RuntimeException("Unable to invoke method " + method + " for " + target, e); } } @@ -322,7 +323,7 @@ public class NbtFactory { private static void setFieldValue(Field field, Object target, Object value) { try { field.set(target, value); - } catch (Exception e) { + } catch (IllegalAccessException | IllegalArgumentException e) { throw new RuntimeException("Unable to set " + field + " for " + target, e); } } @@ -330,7 +331,7 @@ public class NbtFactory { private static Object getFieldValue(Field field, Object target) { try { return field.get(target); - } catch (Exception e) { + } catch (IllegalAccessException | IllegalArgumentException e) { throw new RuntimeException("Unable to retrieve " + field + " for " + target, e); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java index b9f5d3331..f679a01c2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java @@ -133,7 +133,7 @@ public class FastQueue_1_8_3 extends SlowQueue { Method getHandle = chunk.getClass().getDeclaredMethod("getHandle"); Object c = getHandle.invoke(chunk); Object w = this.methodGetWorld.of(c).call(); - Class clazz = c.getClass(); + Class clazz = c.getClass(); Field sections1 = clazz.getDeclaredField("sections"); sections1.setAccessible(true); Field tileEntities = clazz.getDeclaredField("tileEntities"); 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 a68e9a93b..cb4c67f63 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 @@ -1,5 +1,7 @@ package com.plotsquared.bukkit.util.block; +import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; + import com.intellectualcrafters.plot.object.ChunkLoc; import com.intellectualcrafters.plot.object.PseudoRandom; import com.intellectualcrafters.plot.util.ChunkManager; @@ -13,6 +15,12 @@ import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod.RefExecutor; import com.intellectualcrafters.plot.util.SetQueue.ChunkWrapper; import com.intellectualcrafters.plot.util.TaskManager; import com.plotsquared.bukkit.util.BukkitUtil; +import org.bukkit.Chunk; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.World.Environment; +import org.bukkit.block.Biome; + import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -22,14 +30,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; -import org.bukkit.Chunk; -import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.World.Environment; -import org.bukkit.block.Biome; - - -import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass; public class FastQueue_1_9 extends SlowQueue { @@ -118,7 +118,7 @@ public class FastQueue_1_9 extends SlowQueue { Entry tile = iterator.next(); Object pos = tile.getKey(); if (xm == null) { - Class clazz2 = pos.getClass().getSuperclass(); + Class clazz2 = pos.getClass().getSuperclass(); xm = clazz2.getDeclaredMethod("getX"); ym = clazz2.getDeclaredMethod("getY"); zm = clazz2.getDeclaredMethod("getZ"); diff --git a/Core/src/main/java/com/intellectualcrafters/json/XML.java b/Core/src/main/java/com/intellectualcrafters/json/XML.java index 4d65c03f1..ad3a3e509 100644 --- a/Core/src/main/java/com/intellectualcrafters/json/XML.java +++ b/Core/src/main/java/com/intellectualcrafters/json/XML.java @@ -245,7 +245,7 @@ class XML { if (value.toString().equals(string)) { return value; } - } catch (NumberFormatException ignoreAlso) { + } catch (NumberFormatException ignored) { } } return string; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index 036c4e1e2..9121de624 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -80,7 +80,7 @@ public class DebugExec extends SubCommand { this.engine.eval(script, this.scope); } } - } catch (IOException | ScriptException e) { + } catch (IOException | ScriptException ignored) { } } @@ -214,7 +214,7 @@ public class DebugExec extends SubCommand { for (Plot plot : PS.get().getBasePlots()) { Flag flag1 = FlagManager.getFlag(flag); if (plot.getFlag(flag1).isPresent()) { - FlagManager.removePlotFlag(plot, flag1); + plot.removeFlag(flag1); } } return MainUtil.sendMessage(player, "Cleared flag: " + flag); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java index 3f7289560..b62e9e4fd 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java @@ -42,12 +42,10 @@ public class DebugFixFlags extends SubCommand { Iterator, Object>> i = flags.entrySet().iterator(); boolean changed = false; while (i.hasNext()) { -/* - if (FlagManager.getFlag(i.next().getKey()) == null) { + if (i.next().getKey() == null) { changed = true; i.remove(); } -*/ } if (changed) { DBFunc.setFlags(plot, plot.getFlags()); 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 e26d7581a..c67c53e51 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/ListCmd.java @@ -315,7 +315,7 @@ public class ListCmd extends SubCommand { if (uuid == null) { try { uuid = UUID.fromString(args[0]); - } catch (Exception e) { + } catch (Exception ignored) { } } if (uuid != null) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java index 27f2d553f..d23f0ba48 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java @@ -127,16 +127,16 @@ public class Load extends SubCommand { return; } plr.setMeta("plot_schematics", schematics); - displaySaves(plr, 0); + displaySaves(plr); } }); } else { - displaySaves(plr, 0); + displaySaves(plr); } return true; } - public void displaySaves(PlotPlayer player, int page) { + public void displaySaves(PlotPlayer player) { List schematics = player.getMeta("plot_schematics"); for (int i = 0; i < Math.min(schematics.size(), 32); i++) { try { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java index f9ba628a6..3e9b624df 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java @@ -34,7 +34,7 @@ public class Owner extends SetCommand { try { uuid = UUID.fromString(value); name = MainUtil.getName(uuid); - } catch (Exception e) { + } catch (Exception ignored) { } } else { uuid = UUIDHandler.getUUID(value, null); 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 b3d2af40b..09d91043c 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java @@ -166,7 +166,7 @@ public class Configuration { if (result != null && result.match < 2) { values[i] = result.best; } - } catch (NumberFormatException e) { + } catch (NumberFormatException ignored) { } } int gcd = gcd(counts); 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 9998a8b19..b427c7abe 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java @@ -951,8 +951,7 @@ public class Plot { * @param flag */ public boolean removeFlag(Flag flag) { - FlagManager.removePlotFlag(this, flag); - return false; + return FlagManager.removePlotFlag(this, flag); } /** diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java index 7c0533354..6ebc38930 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotId.java @@ -42,7 +42,7 @@ public class PlotId { try { x = Integer.parseInt(parts[0]); y = Integer.parseInt(parts[1]); - } catch (Exception e) { + } catch (NumberFormatException e) { return null; } return new PlotId(x, y); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java index 7e97d73d5..08bc63158 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java @@ -1,7 +1,8 @@ package com.intellectualcrafters.plot.object; public class PseudoRandom { - public static PseudoRandom random = new PseudoRandom(); + + public static final PseudoRandom random = new PseudoRandom(); public long state = System.nanoTime(); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java b/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java index 1b904dd14..c08db1ef7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java @@ -222,7 +222,7 @@ public abstract class ChunkManager { int z = Integer.parseInt(split[2]); ChunkLoc loc = new ChunkLoc(x, z); chunks.add(loc); - } catch (Exception e) { + } catch (NumberFormatException ignored) { } } } 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 2f69d4652..97fd00cfa 100644 --- a/Core/src/main/java/com/plotsquared/general/commands/Command.java +++ b/Core/src/main/java/com/plotsquared/general/commands/Command.java @@ -298,7 +298,7 @@ public abstract class Command { MainCommand.getInstance().help.execute(player, args, null, null); return; } - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException ignored) { } // Command recommendation MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND); diff --git a/Core/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java b/Core/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java deleted file mode 100644 index 40e4b7cd7..000000000 --- a/Core/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.plotsquared.general.commands; - -import java.lang.reflect.Field; - -public class CommandHandlingOutput { - - public static int CALLER_OF_WRONG_TYPE = -6; - public static int NOT_COMMAND = -5; - public static int NOT_FOUND = -4; - public static int NOT_PERMITTED = -3; - public static int ERROR = -2; - public static int WRONG_USAGE = -1; - - public static int SUCCESS = 1; - - public static String nameField(int code) { - Field[] fields = CommandHandlingOutput.class.getDeclaredFields(); - for (Field field : fields) { - if (field.getGenericType() == Integer.TYPE) { - try { - if ((Integer) field.get(CommandHandlingOutput.class) == code) { - return field.getName(); - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - } - return "null??"; - } -} diff --git a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java index 36a2c75ec..850c94021 100644 --- a/Core/src/main/java/com/plotsquared/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java @@ -84,7 +84,7 @@ public class WESubscriber { if (tool instanceof BrushTool) { hasMask = ((BrushTool) tool).getMask() != null; } - } catch (Exception e) { + } catch (Exception ignored) { } } AbstractDelegateExtent extent = (AbstractDelegateExtent) event.getExtent(); diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java index 3f8b61a20..961d12b7d 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java @@ -43,6 +43,7 @@ import org.spongepowered.api.world.biome.BiomeTypes; import org.spongepowered.api.world.extent.Extent; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; @@ -154,7 +155,8 @@ public class SpongeUtil extends WorldUtil { PlotBlock plotBlock = new PlotBlock((short) (i & 0xFFF), (byte) (i >> 12 & 0xF)); stateArray[i] = state; stateMap.put(state, plotBlock); - } catch (Throwable e) {} + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) { + } } PS.debug("Done!"); } catch (Throwable e) { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/block/FastQueue.java b/Sponge/src/main/java/com/plotsquared/sponge/util/block/FastQueue.java index 93e6b8e8e..10c7b3e27 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/block/FastQueue.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/block/FastQueue.java @@ -28,7 +28,7 @@ import java.util.Set; public class FastQueue extends SlowQueue { public final SendChunk chunkSender; - public HashMap toUpdate = new HashMap<>(); + public final HashMap toUpdate = new HashMap<>(); public FastQueue() throws RuntimeException { TaskManager.runTaskRepeat(new Runnable() { @@ -38,7 +38,7 @@ public class FastQueue extends SlowQueue { return; } int count = 0; - ArrayList chunks = new ArrayList(); + ArrayList chunks = new ArrayList<>(); Iterator> i = FastQueue.this.toUpdate.entrySet().iterator(); while (i.hasNext() && (count < 128)) { chunks.add(i.next().getValue()); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71b56a22d..9bed8f52c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 20 16:28:49 EDT 2016 +#Tue Apr 26 09:51:19 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip