diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-02-26 03:30:11 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-02-26 03:30:11 +0000 |
commit | 5060048a31afc53f9e28ae90c848c2d8bd55d402 (patch) | |
tree | 0c1b74c909a32e8e37178be3e651c47aa10ca36c | |
parent | f994f0eb1d97e07fe1abf4c4966b3c4cd3069e6b (diff) | |
download | Essentials-5060048a31afc53f9e28ae90c848c2d8bd55d402.tar Essentials-5060048a31afc53f9e28ae90c848c2d8bd55d402.tar.gz Essentials-5060048a31afc53f9e28ae90c848c2d8bd55d402.tar.lz Essentials-5060048a31afc53f9e28ae90c848c2d8bd55d402.tar.xz Essentials-5060048a31afc53f9e28ae90c848c2d8bd55d402.zip |
Revert "[Spawn] Please join me in welcoming EssentialsSpawn to Java 1.6 and modern bukkit.
This reverts commit 276f0f8972587799dffceab1330df760a80d6cfa.
If you don't understand the code, don't touch it.
-rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java | 5 | ||||
-rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java index 88be7169e..f0c5ee466 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java @@ -23,7 +23,6 @@ public class EssentialsSpawn extends JavaPlugin private transient IEssentials ess; private transient SpawnStorage spawns; - @Override public void onEnable() { final PluginManager pluginManager = getServer().getPluginManager(); @@ -60,13 +59,13 @@ public class EssentialsSpawn extends JavaPlugin }, this); } - @Override public void onDisable() { } @Override - public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args) + public boolean onCommand(final CommandSender sender, final Command command, + final String commandLabel, final String[] args) { return ess.onCommandEssentials(sender, command, commandLabel, args, EssentialsSpawn.class.getClassLoader(), "com.earth2me.essentials.spawn.Command", "essentials.", spawns); } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index daeea443f..eecbe5b03 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -16,8 +16,6 @@ import java.util.logging.Logger; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -37,7 +35,6 @@ public class EssentialsSpawnPlayerListener implements Listener this.spawns = spawns; } - @EventHandler (priority = EventPriority.HIGH) public void onPlayerRespawn(final PlayerRespawnEvent event) { final User user = ess.getUser(event.getPlayer()); @@ -72,7 +69,6 @@ public class EssentialsSpawnPlayerListener implements Listener } } - @EventHandler (priority = EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { ess.runTaskAsynchronously(new Runnable() |