summaryrefslogtreecommitdiffstats
path: root/EssentialsSpawn/src
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-26 03:30:11 +0000
committerKHobbits <rob@khobbits.co.uk>2013-02-26 03:30:11 +0000
commitbe98b5d9156a4a73187aa376e3144382e207e488 (patch)
tree1fc2fc467fd057fa6da7fd06e2adae92f9d70052 /EssentialsSpawn/src
parentf007b390e19e7ab0ddaddf3bbb01c8d2eae0c729 (diff)
downloadEssentials-be98b5d9156a4a73187aa376e3144382e207e488.tar
Essentials-be98b5d9156a4a73187aa376e3144382e207e488.tar.gz
Essentials-be98b5d9156a4a73187aa376e3144382e207e488.tar.lz
Essentials-be98b5d9156a4a73187aa376e3144382e207e488.tar.xz
Essentials-be98b5d9156a4a73187aa376e3144382e207e488.zip
Revert "[Spawn] Please join me in welcoming EssentialsSpawn to Java 1.6 and modern bukkit.
This reverts commit a403dbabf6503e103d390db53c0791e4ec92af72. If you don't understand the code, don't touch it.
Diffstat (limited to 'EssentialsSpawn/src')
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java5
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java4
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()