diff --git a/pom.xml b/pom.xml index 5ba7ebcf..59bdb602 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ Bukkit Offical - http://repo.bukkit.org/content/repositories/public/ + http://repo.bukkit.org/content/repositories/public diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java index 55763ffc..c878c4a5 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVConfigReloadEvent.java @@ -8,6 +8,7 @@ package com.onarandombox.MultiverseCore.event; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; import java.util.List; @@ -23,6 +24,24 @@ public class MVConfigReloadEvent extends Event { this.configsLoaded = configsLoaded; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Adds a config to this event. * @param config The config to add. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java index 0e293ee7..32cb6421 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVPlayerTouchedPortalEvent.java @@ -11,6 +11,7 @@ import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; /** * This event is thrown when a portal is touched. @@ -26,6 +27,24 @@ public class MVPlayerTouchedPortalEvent extends Event implements Cancellable { this.l = l; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Gets the {@link Location} of the portal-block that was touched. * @return The {@link Location} of the portal-block that was touched. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java index fba5c8d2..c94f4828 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVRespawnEvent.java @@ -10,6 +10,7 @@ package com.onarandombox.MultiverseCore.event; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; /** * Called when a player is respawning. @@ -27,6 +28,24 @@ public class MVRespawnEvent extends Event { this.respawnMethod = respawnMethod; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Gets the {@link Player} that's respawning. * @return The {@link Player} that's respawning. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java index 0de2f7b8..ea2ff031 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVTeleportEvent.java @@ -14,6 +14,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; /** * Event that gets called when a player use the /mvtp command. @@ -33,6 +34,24 @@ public class MVTeleportEvent extends Event implements Cancellable { this.useSafeTeleport = safeTeleport; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Returns the player who will be teleported by this event. * diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java index 6580dafc..cb4698f1 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVVersionEvent.java @@ -1,6 +1,7 @@ package com.onarandombox.MultiverseCore.event; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; /** * Called when somebody requests version information about Multiverse. @@ -14,6 +15,24 @@ public class MVVersionEvent extends Event { versionInfoBuilder = new StringBuilder(versionInfo); } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Gets the version-info currently saved in this event. * @return The version-info. diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java index e24b3b71..38bf215d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldDeleteEvent.java @@ -4,6 +4,7 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import com.onarandombox.MultiverseCore.api.MultiverseWorld; +import org.bukkit.event.HandlerList; /** * Called when a world is about to be deleted by Multiverse. @@ -24,6 +25,24 @@ public class MVWorldDeleteEvent extends Event implements Cancellable { this.removeFromConfig = removeFromConfig; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of HANDLERS. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java index 06b4e0a4..8d74d471 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java +++ b/src/main/java/com/onarandombox/MultiverseCore/event/MVWorldPropertyChangeEvent.java @@ -11,6 +11,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld; import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; /** * This event is fired *before* the property is actually changed. @@ -27,7 +28,6 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable { private String value; private String name; - public MVWorldPropertyChangeEvent(MultiverseWorld world, CommandSender changer, String name, String value) { super("MVWorldPropertyChange"); this.world = world; @@ -36,6 +36,24 @@ public class MVWorldPropertyChangeEvent extends Event implements Cancellable { this.value = value; } + private static final HandlerList HANDLERS = new HandlerList(); + + /** + * {@inheritDoc} + */ + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + /** + * Gets the handler list. This is required by the event system. + * @return A list of handlers. + */ + public static HandlerList getHandlerList() { + return HANDLERS; + } + /** * Gets the changed world property's name. * @return The changed world property's name.