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 | 6f55e4b3165924c917334aae4e8f6d0fdd2145a7 (patch) | |
| tree | e74b1e126281cd3dfc5c918e79dfc9cb197f02b7 | |
| parent | de91073dda6ac07f06f2d378bec8b6c7f904a23c (diff) | |
| download | Essentials-6f55e4b3165924c917334aae4e8f6d0fdd2145a7.tar Essentials-6f55e4b3165924c917334aae4e8f6d0fdd2145a7.tar.gz Essentials-6f55e4b3165924c917334aae4e8f6d0fdd2145a7.tar.lz Essentials-6f55e4b3165924c917334aae4e8f6d0fdd2145a7.tar.xz Essentials-6f55e4b3165924c917334aae4e8f6d0fdd2145a7.zip | |
Revert "[Spawn] Please join me in welcoming EssentialsSpawn to Java 1.6 and modern bukkit.
This reverts commit a11e8d42361c0e01d6dbefad7718723efd525fcf.
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() |