diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 4af01ad6..c10f173b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -128,9 +128,9 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core { private static final int PROTOCOL = 24; // TODO: Investigate if this one is really needed to be static. // Doubt it. -- FernFerret - private static Map teleportQueue = new HashMap(); + private static final Map teleportQueue = new HashMap(); - private AnchorManager anchorManager = new AnchorManager(this); + private final AnchorManager anchorManager = new AnchorManager(this); // TODO please let's make this non-static private volatile MultiverseCoreConfiguration config; diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java index 95a0bf14..9455038e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CloneCommand.java @@ -20,7 +20,7 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager; * Creates a clone of a world. */ public class CloneCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public CloneCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java index 55424a94..be63197f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java @@ -19,6 +19,7 @@ import java.util.Map; * Allows you to set Global MV Variables. */ public class ConfigCommand extends MultiverseCommand { + public ConfigCommand(MultiverseCore plugin) { super(plugin); this.setName("Configuration"); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java index 485cc370..c6963afd 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java @@ -24,7 +24,7 @@ import java.util.List; * Returns detailed information on the Players where abouts. */ public class CoordCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public CoordCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java index 87bdacab..2e784e55 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java @@ -26,7 +26,7 @@ import java.util.List; * Creates a new world and loads it. */ public class CreateCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public CreateCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java index ed7eb415..83d16310 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java @@ -30,7 +30,7 @@ import java.util.List; * Returns detailed information about a world. */ public class InfoCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public InfoCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java index 1175d340..b78c7be7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java @@ -25,7 +25,7 @@ import java.util.List; * Used to modify various aspects of worlds. */ public class ModifyAddCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public ModifyAddCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java index 788b7452..c9dbbe4d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java @@ -22,7 +22,7 @@ import java.util.List; * Removes all values from a world-property. */ public class ModifyClearCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public ModifyClearCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java index f714be76..a1a8f8f2 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java @@ -22,7 +22,7 @@ import java.util.List; * Removes values from a world-property. */ public class ModifyRemoveCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public ModifyRemoveCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java index 54bf8a11..c68d2f0d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java @@ -23,7 +23,7 @@ import java.util.List; * Used to set world-properties. */ public class ModifySetCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public ModifySetCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java index 8b7c4a26..0cc6cd0e 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java @@ -24,7 +24,7 @@ import java.util.List; * Removes a type of mob from a world. */ public class PurgeCommand extends MultiverseCommand { - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public PurgeCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java index 17ad7714..05eea150 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java @@ -34,7 +34,7 @@ import java.util.logging.Level; * Used to teleport players. */ public class TeleportCommand extends MultiverseCommand { - private SafeTTeleporter playerTeleporter; + private final SafeTTeleporter playerTeleporter; public TeleportCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java index 1a03df28..0d8bf248 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java @@ -23,8 +23,7 @@ import java.util.List; * States who is in what world. */ public class WhoCommand extends MultiverseCommand { - - private MVWorldManager worldManager; + private final MVWorldManager worldManager; public WhoCommand(MultiverseCore plugin) { super(plugin); diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java index bae3541b..853c24a1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java @@ -16,7 +16,7 @@ import java.util.List; * Called when the Multiverse-config should be reloaded. */ public class MVConfigReloadEvent extends Event { - private List configsLoaded; + private final List configsLoaded; public MVConfigReloadEvent(List configsLoaded) { this.configsLoaded = configsLoaded; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java index 56ec89e3..8c3d0a70 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java @@ -17,8 +17,8 @@ import org.bukkit.event.HandlerList; * This event is thrown when a portal is touched. */ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable { - private Player p; - private Location l; + private final Player p; + private final Location l; private boolean isCancelled; private boolean canUse = true; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java index 0f71cdf8..f7291f81 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java @@ -16,10 +16,9 @@ import org.bukkit.event.HandlerList; * Called when a player is respawning. */ public class MVRespawnEvent extends Event { - private Player player; + private final Player player; + private final String respawnMethod; private Location location; - private String respawnMethod; - public MVRespawnEvent(Location spawningAt, Player p, String respawnMethod) { this.player = p; diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java index fac53728..4b0f0962 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java @@ -21,10 +21,10 @@ import org.bukkit.event.HandlerList; * Event that gets called when a player use the /mvtp command. */ public class MVTeleportEvent extends Event implements Cancellable { - private Player teleportee; - private CommandSender teleporter; - private MVDestination dest; - private boolean useSafeTeleport; + private final Player teleportee; + private final CommandSender teleporter; + private final MVDestination dest; + private final boolean useSafeTeleport; private boolean isCancelled; public MVTeleportEvent(MVDestination dest, Player teleportee, CommandSender teleporter, boolean safeTeleport) { diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java index d85e104a..3058dfb9 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java @@ -24,11 +24,11 @@ import org.bukkit.event.HandlerList; * @param The type of the property that was set. */ public class MVWorldPropertyChangeEvent extends Event implements Cancellable { - private MultiverseWorld world; - private CommandSender changer; - private boolean isCancelled = false; - private String name; + private final MultiverseWorld world; + private final CommandSender changer; + private final String name; private T value; + private boolean isCancelled = false; public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, T value) { this.world = world; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java index f99788c1..f635187b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java @@ -28,8 +28,8 @@ import java.util.logging.Level; * Multiverse's Entity {@link Listener}. */ public class MVEntityListener implements Listener { - private MultiverseCore plugin; - private MVWorldManager worldManager; + private final MultiverseCore plugin; + private final MVWorldManager worldManager; public MVEntityListener(MultiverseCore plugin) { this.plugin = plugin; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java index c348ac3d..2c519ded 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java @@ -26,7 +26,7 @@ import java.util.logging.Level; */ public class MVPortalListener implements Listener { - private MultiverseCore plugin; + private final MultiverseCore plugin; public MVPortalListener(MultiverseCore core) { this.plugin = core; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java index 358803e1..685d45aa 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java @@ -18,7 +18,7 @@ import org.bukkit.event.weather.WeatherChangeEvent; * Multiverse's Weather {@link Listener}. */ public class MVWeatherListener implements Listener { - private MultiverseCore plugin; + private final MultiverseCore plugin; public MVWeatherListener(MultiverseCore plugin) { this.plugin = plugin; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldInitListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldInitListener.java index cc12a10e..1ac226ba 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldInitListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldInitListener.java @@ -14,7 +14,7 @@ import org.bukkit.event.world.WorldInitEvent; public class MVWorldInitListener implements Listener { - MultiverseCore plugin; + private final MultiverseCore plugin; public MVWorldInitListener(MultiverseCore plugin) { this.plugin = plugin; diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java index a63d32bf..7bf07367 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWorldListener.java @@ -20,8 +20,8 @@ import org.bukkit.event.world.WorldUnloadEvent; * Multiverse's World {@link Listener}. */ public class MVWorldListener implements Listener { - private MultiverseCore plugin; - private MVWorldManager worldManager; + private final MultiverseCore plugin; + private final MVWorldManager worldManager; public MVWorldListener(MultiverseCore plugin) { this.plugin = plugin;