diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-01-21 11:47:08 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-01-21 11:47:08 +0000 |
commit | 4b61ac9043ff6088c4910d497e8ee18e13d5494b (patch) | |
tree | cfa621a3b42dc0b411b4180bc44e7633e1a5f8ca /EssentialsGroupManager/src/org/anjocaido/groupmanager/events | |
parent | 72edfacfb8ccdc44450ad9a9bee930d68f251db6 (diff) | |
download | Essentials-4b61ac9043ff6088c4910d497e8ee18e13d5494b.tar Essentials-4b61ac9043ff6088c4910d497e8ee18e13d5494b.tar.gz Essentials-4b61ac9043ff6088c4910d497e8ee18e13d5494b.tar.lz Essentials-4b61ac9043ff6088c4910d497e8ee18e13d5494b.tar.xz Essentials-4b61ac9043ff6088c4910d497e8ee18e13d5494b.zip |
Update to new Bukkit Event system.
Update GroupManagerBridge for new event system.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/events')
4 files changed, 47 insertions, 5 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java index 9a44a21b8..4482f3d9e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMGroupEvent.java @@ -1,6 +1,7 @@ package org.anjocaido.groupmanager.events;
import org.anjocaido.groupmanager.data.Group;
+import org.bukkit.event.HandlerList;
/**
@@ -13,6 +14,18 @@ public class GMGroupEvent extends GroupManagerEvent { *
*/
private static final long serialVersionUID = -5294917600434510451L;
+ private static final HandlerList handlers = new HandlerList();
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+
+ //////////////////////////////
protected Group group;
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java index f7ecf79de..eb4b95c03 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMSystemEvent.java @@ -1,5 +1,7 @@ package org.anjocaido.groupmanager.events;
+import org.bukkit.event.HandlerList;
+
/**
* @author ElgarL
@@ -11,6 +13,19 @@ public class GMSystemEvent extends GroupManagerEvent { *
*/
private static final long serialVersionUID = -8786811924448821548L;
+ private static final HandlerList handlers = new HandlerList();
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+
+ //////////////////////////////
+
protected Action action;
public GMSystemEvent(Action action) {
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java index 68483c036..efa591562 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMUserEvent.java @@ -1,6 +1,7 @@ package org.anjocaido.groupmanager.events;
import org.anjocaido.groupmanager.data.User;
+import org.bukkit.event.HandlerList;
/**
@@ -13,6 +14,18 @@ public class GMUserEvent extends GroupManagerEvent { *
*/
private static final long serialVersionUID = -5294917600434510451L;
+ private static final HandlerList handlers = new HandlerList();
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+
+ //////////////////////////////
protected User user;
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java index 037971314..fd1a9d7ff 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/events/GMWorldListener.java @@ -1,9 +1,10 @@ package org.anjocaido.groupmanager.events;
import org.anjocaido.groupmanager.GroupManager;
-import org.bukkit.event.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldInitEvent;
-import org.bukkit.event.world.WorldListener;
/**
@@ -12,7 +13,7 @@ import org.bukkit.event.world.WorldListener; * Handle new world creation from other plugins
*
*/
-public class GMWorldListener extends WorldListener {
+public class GMWorldListener implements Listener {
private final GroupManager plugin;
@@ -22,10 +23,10 @@ public class GMWorldListener extends WorldListener { }
private void registerEvents() {
- plugin.getServer().getPluginManager().registerEvent(Event.Type.WORLD_INIT, this, Event.Priority.Lowest, plugin);
+ plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
- @Override
+ @EventHandler(priority = EventPriority.LOWEST)
public void onWorldInit(WorldInitEvent event) {
String worldName = event.getWorld().getName();
|