From e93fec45ac135b771972450fa9ee979d1e1c5be1 Mon Sep 17 00:00:00 2001 From: fernferret Date: Mon, 10 Oct 2011 09:34:04 -0600 Subject: [PATCH] Much needed code reformat --- .../MultiverseCore/LoggablePlugin.java | 2 -- .../MultiverseCore/MVPermissions.java | 6 +--- .../MultiverseCore/MultiverseCore.java | 1 - .../MultiverseCore/api/MVPlugin.java | 3 +- .../commands/TeleportCommand.java | 5 ++-- .../destination/BedDestination.java | 1 + .../destination/CannonDestination.java | 7 ++--- .../destination/DestinationFactory.java | 30 +++++++++---------- .../destination/ExactDestination.java | 9 +++--- .../destination/InvalidDestination.java | 3 +- .../destination/PlayerDestination.java | 3 +- .../MultiverseCore/enums/ConfigProperty.java | 4 +-- .../listeners/MVPluginListener.java | 5 ++-- .../MultiverseCore/utils/BlockSafety.java | 12 +++++--- .../MultiverseCore/utils/DebugLog.java | 7 +---- .../MultiverseCore/utils/FancyMessage.java | 7 +++++ .../utils/LocationManipulation.java | 27 ++++++++++++++--- .../MultiverseCore/utils/MVMessaging.java | 20 +++++++------ .../MultiverseCore/utils/MVTravelAgent.java | 5 ++-- .../MultiverseCore/utils/PermissionTools.java | 2 ++ .../MultiverseCore/utils/SafeTTeleporter.java | 2 -- .../MultiverseCore/utils/UpdateChecker.java | 1 + .../java/com/onarandombox/utils/DebugLog.java | 2 +- .../utils/DestinationFactory.java | 5 ---- 24 files changed, 92 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/LoggablePlugin.java b/src/main/java/com/onarandombox/MultiverseCore/LoggablePlugin.java index 003ad898..c358cef2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/LoggablePlugin.java +++ b/src/main/java/com/onarandombox/MultiverseCore/LoggablePlugin.java @@ -7,8 +7,6 @@ package com.onarandombox.MultiverseCore; -import com.pneumaticraft.commandhandler.Command; - /** * Dummy class to make old MV Plugins not explode. * If this loads, the user WILL get a severe telling them to update said plugin! diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVPermissions.java b/src/main/java/com/onarandombox/MultiverseCore/MVPermissions.java index 70c41c06..2824b8f3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVPermissions.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVPermissions.java @@ -7,17 +7,13 @@ package com.onarandombox.MultiverseCore; -import com.pneumaticraft.commandhandler.Command; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionDefault; - /** * Dummy class to make old MV Plugins not explode. * If this loads, the user WILL get a severe telling them to update said plugin! * WILL BE DELETED ON 11/1/11 */ @Deprecated -public class MVPermissions extends com.onarandombox.MultiverseCore.utils.MVPermissions{ +public class MVPermissions extends com.onarandombox.MultiverseCore.utils.MVPermissions { public MVPermissions(MultiverseCore plugin) { super(plugin); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 9f1e6b7b..01c9fe26 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -38,7 +38,6 @@ import org.bukkit.util.config.Configuration; import java.io.*; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java index bb516146..7cd4e282 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVPlugin.java @@ -34,7 +34,8 @@ public interface MVPlugin extends LoggablePlugin { public void setCore(MultiverseCore core); /** - * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This number + * Allows Multiverse or a plugin to query another Multiverse plugin to see what version its protocol is. This + * number * should change when something will break the code. * * @return The Integer protocol version. diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java index ae061f22..7c6a12fe 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java @@ -7,14 +7,15 @@ package com.onarandombox.MultiverseCore.commands; -import com.onarandombox.MultiverseCore.utils.SafeTTeleporter; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.destination.DestinationFactory; import com.onarandombox.MultiverseCore.destination.InvalidDestination; import com.onarandombox.MultiverseCore.destination.WorldDestination; import com.onarandombox.MultiverseCore.event.MVTeleportEvent; -import com.onarandombox.MultiverseCore.utils.*; +import com.onarandombox.MultiverseCore.utils.LocationManipulation; +import com.onarandombox.MultiverseCore.utils.MVMessaging; +import com.onarandombox.MultiverseCore.utils.SafeTTeleporter; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java index 3e17c613..a2510342 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/BedDestination.java @@ -83,6 +83,7 @@ public class BedDestination implements MVDestination { // Bukkit should have already checked this. return false; } + @Override public String toString() { return "b:playerbed"; diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java index 38af42af..ea3b8015 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/CannonDestination.java @@ -7,16 +7,15 @@ package com.onarandombox.MultiverseCore.destination; -import java.util.Arrays; -import java.util.List; - +import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -import com.onarandombox.MultiverseCore.MultiverseCore; +import java.util.Arrays; +import java.util.List; public class CannonDestination implements MVDestination { private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)"; diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java index e03d929c..565bb8e3 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/DestinationFactory.java @@ -7,10 +7,6 @@ package com.onarandombox.MultiverseCore.destination; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.commands.TeleportCommand; @@ -19,6 +15,10 @@ import com.pneumaticraft.commandhandler.Command; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class DestinationFactory { private MultiverseCore plugin; private Map> destList; @@ -28,8 +28,8 @@ public class DestinationFactory { this.plugin = plugin; this.destList = new HashMap>(); List cmds = this.plugin.getCommandHandler().getAllCommands(); - for(Command c : cmds) { - if(c instanceof TeleportCommand) { + for (Command c : cmds) { + if (c instanceof TeleportCommand) { this.teleportCommand = c; } } @@ -63,21 +63,21 @@ public class DestinationFactory { } this.destList.put(identifier, c); // Special case for world defaults: - if(identifier.equals("")) { + if (identifier.equals("")) { identifier = "w"; } - Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self."+identifier); - Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other."+identifier); + Permission self = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.self." + identifier); + Permission other = this.plugin.getServer().getPluginManager().getPermission("multiverse.teleport.other." + identifier); PermissionTools pt = new PermissionTools(this.plugin); - if(self == null) { - self = new Permission("multiverse.teleport.self."+identifier,"Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP); + if (self == null) { + self = new Permission("multiverse.teleport.self." + identifier, "Permission to teleport yourself for the " + identifier + " destination.", PermissionDefault.OP); this.plugin.getServer().getPluginManager().addPermission(self); - pt.addToParentPerms("multiverse.teleport.self."+identifier); + pt.addToParentPerms("multiverse.teleport.self." + identifier); } - if(other == null) { - other = new Permission("multiverse.teleport.other."+identifier,"Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP); + if (other == null) { + other = new Permission("multiverse.teleport.other." + identifier, "Permission to teleport others for the " + identifier + " destination.", PermissionDefault.OP); this.plugin.getServer().getPluginManager().addPermission(other); - pt.addToParentPerms("multiverse.teleport.other."+identifier); + pt.addToParentPerms("multiverse.teleport.other." + identifier); } this.teleportCommand.addAdditonalPermission(self); this.teleportCommand.addAdditonalPermission(other); diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java index 1cc65753..2f74a4c4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/ExactDestination.java @@ -7,16 +7,15 @@ package com.onarandombox.MultiverseCore.destination; -import java.util.Arrays; -import java.util.List; - +import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -import com.onarandombox.MultiverseCore.MultiverseCore; +import java.util.Arrays; +import java.util.List; public class ExactDestination implements MVDestination { private final String coordRegex = "(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*),(-?[\\d]+\\.?[\\d]*)"; @@ -29,7 +28,7 @@ public class ExactDestination implements MVDestination { } public Vector getVelocity() { - return new Vector(0,0,0); + return new Vector(0, 0, 0); } @Override diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java index 4a44c548..b8c832ed 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/InvalidDestination.java @@ -60,8 +60,9 @@ public class InvalidDestination implements MVDestination { public String getRequiredPermission() { return null; } + public Vector getVelocity() { - return new Vector(0,0,0); + return new Vector(0, 0, 0); } @Override diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java index b17e890c..87cb29ba 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java +++ b/src/main/java/com/onarandombox/MultiverseCore/destination/PlayerDestination.java @@ -90,8 +90,9 @@ public class PlayerDestination implements MVDestination { public String getRequiredPermission() { return ""; } + public Vector getVelocity() { - return new Vector(0,0,0); + return new Vector(0, 0, 0); } @Override diff --git a/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java b/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java index 485e12a3..12b482a8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java +++ b/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java @@ -7,9 +7,7 @@ package com.onarandombox.MultiverseCore.enums; -/** - * Multiverse 2 - */ +/** Multiverse 2 */ public enum ConfigProperty { messagecooldown, teleportcooldown, worldnameprefix, useworldaccess, disableautoheal, fakepvp, bedrespawn } diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java index 12e409b4..14378581 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPluginListener.java @@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore.listeners; import com.fernferret.allpay.AllPay; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.MultiverseCore.api.MVPlugin; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.ServerListener; @@ -28,10 +27,10 @@ public class MVPluginListener extends ServerListener { /** Keep an eye out for Plugins which we can utilize. */ @Override public void onPluginEnable(PluginEnableEvent event) { - if(event.getPlugin() instanceof com.onarandombox.MultiverseCore.MVPlugin) { + if (event.getPlugin() instanceof com.onarandombox.MultiverseCore.MVPlugin) { this.plugin.log(Level.SEVERE, "Your version of '" + event.getPlugin() + "' is OUT OF DATE."); this.plugin.log(Level.SEVERE, "Please grab the latest version from:"); - this.plugin.log(Level.SEVERE, "http://bukkit.onarandombox.com/?dir="+event.getPlugin().getDescription().getName().toLowerCase()); + this.plugin.log(Level.SEVERE, "http://bukkit.onarandombox.com/?dir=" + event.getPlugin().getDescription().getName().toLowerCase()); this.plugin.log(Level.SEVERE, "I'm going to disable " + event.getPlugin().getDescription().getName() + " now."); this.plugin.log(Level.SEVERE, "IF YOU DO NOT UPDATE, YOUR SERVER WILL **NOT** FUNCTION PROPERLY!!!"); this.plugin.getServer().getPluginManager().disablePlugin(event.getPlugin()); diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/BlockSafety.java b/src/main/java/com/onarandombox/MultiverseCore/utils/BlockSafety.java index c14c8213..f2b5eedc 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/BlockSafety.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/BlockSafety.java @@ -7,8 +7,7 @@ package com.onarandombox.MultiverseCore.utils; -import java.util.logging.Level; - +import com.onarandombox.MultiverseCore.MultiverseCore; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -16,7 +15,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Minecart; import org.bukkit.entity.Vehicle; -import com.onarandombox.MultiverseCore.MultiverseCore; +import java.util.logging.Level; public class BlockSafety { @@ -31,6 +30,7 @@ public class BlockSafety { * @param x * @param y * @param z + * * @return */ public boolean isBlockAboveAir(Location l) { @@ -50,12 +50,14 @@ public class BlockSafety { } /** - * This function checks whether the block at the coordinates given is safe or not by checking for Laval/Fire/Air etc. This also ensures there is enough space for a player to spawn! + * This function checks whether the block at the coordinates given is safe or not by checking for Laval/Fire/Air + * etc. This also ensures there is enough space for a player to spawn! * * @param world * @param x * @param y * @param z + * * @return */ public boolean playerCanSpawnHereSafely(Location l) { @@ -94,6 +96,7 @@ public class BlockSafety { * If someone has a better way of this... Please either tell us, or submit a pull request! * * @param type + * * @return */ private boolean isSolidBlock(Material type) { @@ -184,6 +187,7 @@ public class BlockSafety { * Checks recursively below location L for 2 blocks of water * * @param l + * * @return */ public boolean hasTwoBlocksofWaterBelow(Location l) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java b/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java index 6653e7b7..0c29e935 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/DebugLog.java @@ -11,12 +11,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.text.SimpleDateFormat; -import java.util.logging.FileHandler; -import java.util.logging.Formatter; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; +import java.util.logging.*; public class DebugLog { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/FancyMessage.java b/src/main/java/com/onarandombox/MultiverseCore/utils/FancyMessage.java index 6e473baf..bd45a7ef 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/FancyMessage.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/FancyMessage.java @@ -14,8 +14,10 @@ public class FancyMessage implements FancyText { private String message; private boolean main = true; private FancyColorScheme colors; + /** * Allows easy creation of an alternating colored list + * * @param title * @param message */ @@ -24,19 +26,24 @@ public class FancyMessage implements FancyText { this.message = message; this.colors = scheme; } + public void setColorMain() { this.main = true; } + public void setColorAlt() { this.main = false; } + @Override public String getFancyText() { return this.colors.getMain(this.main) + this.title + this.colors.getDefault() + message; } + public void setAltColor(boolean altColor) { this.main = !altColor; } + public void setMainColor(boolean mainColor) { this.main = mainColor; } diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java index c003c3f1..3659c922 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java @@ -7,18 +7,19 @@ package com.onarandombox.MultiverseCore.utils; -import java.text.DecimalFormat; -import java.util.HashMap; -import java.util.Map; - import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Vehicle; import org.bukkit.util.Vector; +import java.text.DecimalFormat; +import java.util.HashMap; +import java.util.Map; + public class LocationManipulation { private static Map orientationInts = new HashMap(); + static { orientationInts.put("n", 180); orientationInts.put("ne", 225); @@ -35,6 +36,7 @@ public class LocationManipulation { * Convert a Location into a Colon separated string to allow us to store it in text. * * @param location + * * @return */ public static String locationToString(Location location) { @@ -56,6 +58,7 @@ public class LocationManipulation { * @param zStr * @param yawStr * @param pitchStr + * * @return */ public Location stringToLocation(World world, String xStr, String yStr, String zStr, String yawStr, String pitchStr) { @@ -70,7 +73,9 @@ public class LocationManipulation { /** * Returns a colored string with the coords + * * @param l + * * @return */ public static String strCoords(Location l) { @@ -85,9 +90,12 @@ public class LocationManipulation { result += ChatColor.WHITE + "Y: " + ChatColor.GOLD + df.format(l.getYaw()) + " "; return result; } + /** * Converts a location to a printable readable formatted string including pitch/yaw + * * @param l + * * @return */ public static String strCoordsRaw(Location l) { @@ -107,6 +115,7 @@ public class LocationManipulation { * Return the NESW Direction a Location is facing. * * @param location + * * @return */ public static String getDirection(Location location) { @@ -134,9 +143,12 @@ public class LocationManipulation { return dir; } + /** * Returns the float yaw position for the given cardianl direction + * * @param orientation + * * @return */ public static float getYaw(String orientation) { @@ -148,9 +160,12 @@ public class LocationManipulation { } return 0; } + /** * Returns a speed float from a given vector. + * * @param v + * * @return */ public static float getSpeed(Vector v) { @@ -159,10 +174,13 @@ public class LocationManipulation { // X, Y, Z // -W/+E,0, -N/+S + /** * Returns a translated vector from the given direction + * * @param v * @param direction + * * @return */ public static Vector getTranslatedVector(Vector v, String direction) { @@ -196,6 +214,7 @@ public class LocationManipulation { * Returns the next Location that an entity is traveling at * * @param v + * * @return */ public static Location getNextBlock(Vehicle v) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVMessaging.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVMessaging.java index 31e082fe..c944845c 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVMessaging.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVMessaging.java @@ -36,22 +36,24 @@ public class MVMessaging { /** * Sends a message to the specified sender if the cooldown has passed. - * @param sender The person/console to send the message to. - * @param message The message to send. + * + * @param sender The person/console to send the message to. + * @param message The message to send. * @param ignoreCooldown If true this message will always be sent. Useful for things like menus + * * @return true if the message was sent, false if not. */ public boolean sendMessage(CommandSender sender, String message, boolean ignoreCooldown) { - if(!(sender instanceof Player) || ignoreCooldown) { + if (!(sender instanceof Player) || ignoreCooldown) { sender.sendMessage(message); return true; } - if(!this.sentList.containsKey(sender.getName())) { + if (!this.sentList.containsKey(sender.getName())) { sender.sendMessage(message); this.sentList.put(sender.getName(), new Date()); return true; } else { - if(this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))){ + if (this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))) { sender.sendMessage(message); this.sentList.put(sender.getName(), new Date()); return true; @@ -61,17 +63,17 @@ public class MVMessaging { } public boolean sendMessages(CommandSender sender, String[] messages, boolean ignoreCooldown) { - if(!(sender instanceof Player) || ignoreCooldown) { + if (!(sender instanceof Player) || ignoreCooldown) { this.sendMessages(sender, messages); return true; } - if(!this.sentList.containsKey(sender.getName())) { + if (!this.sentList.containsKey(sender.getName())) { this.sendMessages(sender, messages); this.sentList.put(sender.getName(), new Date()); return true; } else { - if(this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))){ + if (this.sentList.get(sender.getName()).after(new Date((new Date()).getTime() + this.cooldown))) { this.sendMessages(sender, messages); this.sentList.put(sender.getName(), new Date()); return true; @@ -86,7 +88,7 @@ public class MVMessaging { public boolean sendMessages(CommandSender sender, String[] messages) { boolean success = true; - for(String s : messages) { + for (String s : messages) { success = (!(!this.sendMessage(sender, s, true) && success)); } return success; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java b/src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java index 440ddb57..36672e21 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java @@ -7,15 +7,14 @@ package com.onarandombox.MultiverseCore.utils; -import java.util.logging.Level; - +import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.destination.CannonDestination; import org.bukkit.Location; import org.bukkit.TravelAgent; import org.bukkit.entity.Player; -import com.onarandombox.MultiverseCore.MultiverseCore; +import java.util.logging.Level; public class MVTravelAgent implements TravelAgent { private MVDestination destination; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java b/src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java index 0c6659d2..5434e163 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/PermissionTools.java @@ -16,6 +16,7 @@ public class PermissionTools { public PermissionTools(MultiverseCore plugin) { this.plugin = plugin; } + public void addToParentPerms(String permString) { String permStringChopped = permString.replace(".*", ""); @@ -62,6 +63,7 @@ public class PermissionTools { * If the given permission was 'multiverse.core.tp.self', this would return 'multiverse.core.tp.*'. * * @param separatedPermissionString The array of a dot separated perm string. + * * @return The dot separated parent permission string. */ private String getParentPerm(String[] separatedPermissionString) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java index 4a52ac59..350738e7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java @@ -10,8 +10,6 @@ package com.onarandombox.MultiverseCore.utils; import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVDestination; import com.onarandombox.MultiverseCore.destination.InvalidDestination; -import com.onarandombox.MultiverseCore.utils.BlockSafety; -import com.onarandombox.MultiverseCore.utils.LocationManipulation; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Minecart; diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/UpdateChecker.java b/src/main/java/com/onarandombox/MultiverseCore/utils/UpdateChecker.java index a983f497..edb464ad 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/utils/UpdateChecker.java +++ b/src/main/java/com/onarandombox/MultiverseCore/utils/UpdateChecker.java @@ -88,6 +88,7 @@ public class UpdateChecker { * Convert the given Version String to a Normalised Version String so we can compare it. * * @param version + * * @return */ public static String normalisedVersion(String version) { diff --git a/src/main/java/com/onarandombox/utils/DebugLog.java b/src/main/java/com/onarandombox/utils/DebugLog.java index 9268ae28..6a4bb056 100644 --- a/src/main/java/com/onarandombox/utils/DebugLog.java +++ b/src/main/java/com/onarandombox/utils/DebugLog.java @@ -14,7 +14,7 @@ package com.onarandombox.utils; */ @Deprecated -public class DebugLog extends com.onarandombox.MultiverseCore.utils.DebugLog{ +public class DebugLog extends com.onarandombox.MultiverseCore.utils.DebugLog { public DebugLog(String logger, String file) { super(logger, file); } diff --git a/src/main/java/com/onarandombox/utils/DestinationFactory.java b/src/main/java/com/onarandombox/utils/DestinationFactory.java index 708ac69a..6400e19b 100644 --- a/src/main/java/com/onarandombox/utils/DestinationFactory.java +++ b/src/main/java/com/onarandombox/utils/DestinationFactory.java @@ -8,11 +8,6 @@ package com.onarandombox.utils; import com.onarandombox.MultiverseCore.MultiverseCore; -import com.onarandombox.utils.MVDestination; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.util.Vector; /** * Dummy class to make old MV Plugins not explode.