Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the remaining Listeners to the new event system.

Browse Source
This commit is contained in:
TomyLobo 2012-01-18 17:50:07 +01:00
parent edc955c5b6
commit 4e4a5a02c9
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sk89q/bukkit/util/CommandRegistration.java
View File

@ -30,7 +30,6 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;
import org.bukkit.command.SimpleCommandMap; import org.bukkit.command.SimpleCommandMap;
import org.bukkit.event.Event;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
/** /**
@ -71,8 +70,7 @@ public class CommandRegistration {
Bukkit.getServer().getLogger().severe(plugin.getDescription().getName() + Bukkit.getServer().getLogger().severe(plugin.getDescription().getName() +
": Could not retrieve server CommandMap, using fallback instead! Please report to http://redmine.sk89q.com"); ": Could not retrieve server CommandMap, using fallback instead! Please report to http://redmine.sk89q.com");
fallbackCommands = commandMap = new SimpleCommandMap(Bukkit.getServer()); fallbackCommands = commandMap = new SimpleCommandMap(Bukkit.getServer());
Bukkit.getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND_PREPROCESS, Bukkit.getServer().getPluginManager().registerEvents(new FallbackRegistrationListener(fallbackCommands), plugin);
new FallbackRegistrationListener(fallbackCommands), Event.Priority.Normal, plugin);
} }
} }
return commandMap; return commandMap;

7
src/main/java/com/sk89q/bukkit/util/FallbackRegistrationListener.java
View File

@ -19,13 +19,14 @@
package com.sk89q.bukkit.util; package com.sk89q.bukkit.util;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerListener;
/** /**
* @author zml2008 * @author zml2008
*/ */
public class FallbackRegistrationListener extends PlayerListener { public class FallbackRegistrationListener implements Listener {
private final CommandMap commandRegistration; private final CommandMap commandRegistration;
@ -33,7 +34,7 @@ public class FallbackRegistrationListener extends PlayerListener {
this.commandRegistration = commandRegistration; this.commandRegistration = commandRegistration;
} }
@Override @EventHandler(event = PlayerCommandPreprocessEvent.class)
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;

16
src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
View File

@ -23,7 +23,7 @@ import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor; import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.Event; import org.bukkit.event.EventHandler;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -260,9 +260,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
private static final long serialVersionUID = 7044832912491608706L; private static final long serialVersionUID = 7044832912491608706L;
} }
class ServerListener extends org.bukkit.event.server.ServerListener { class ServerListener implements org.bukkit.event.Listener {
@EventHandler(event = PluginEnableEvent.class)
@Override
public void onPluginEnable(PluginEnableEvent event) { public void onPluginEnable(PluginEnableEvent event) {
Plugin plugin = event.getPlugin(); Plugin plugin = event.getPlugin();
String name = plugin.getDescription().getName(); String name = plugin.getDescription().getName();
@ -273,7 +272,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
} }
} }
@Override @EventHandler(event = PluginDisableEvent.class)
public void onPluginDisable(PluginDisableEvent event) { public void onPluginDisable(PluginDisableEvent event) {
String name = event.getPlugin().getDescription().getName(); String name = event.getPlugin().getDescription().getName();
@ -282,12 +281,9 @@ public class PermissionsResolverManager implements PermissionsResolver {
load(); load();
} }
} }
void register(Plugin plugin) { void register(Plugin plugin) {
plugin.getServer().getPluginManager().registerEvent(Event.Type.PLUGIN_ENABLE, plugin.getServer().getPluginManager().registerEvents(this, plugin);
this, Event.Priority.Normal, plugin);
plugin.getServer().getPluginManager().registerEvent(Event.Type.PLUGIN_DISABLE,
this, Event.Priority.Normal, plugin);
} }
} }

3
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -33,9 +33,6 @@ import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.sk89q.worldedit.*; import com.sk89q.worldedit.*;
import com.sk89q.worldedit.bags.BlockBag; import com.sk89q.worldedit.bags.BlockBag;