Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-30 14:13:52 +01:00
Code Issues Projects Releases Wiki Activity

Remove MPluginSecretServerListener. Fixes #414

Browse Source
This commit is contained in:
cnr 2015-09-08 13:12:11 -05:00
parent 11bd632b15
commit c68d3e8e2f
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/massivecraft/factions/P.java
View File

@ -182,8 +182,7 @@ public class P extends MPlugin {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] split) { public boolean onCommand(CommandSender sender, Command command, String label, String[] split) {
// if bare command at this point, it has already been handled by MPlugin's command listeners if (split.length == 0) {
if (split == null || split.length == 0) {
return handleCommand(sender, "/f help", false); return handleCommand(sender, "/f help", false);
} }

5
src/main/java/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -50,7 +50,6 @@ public abstract class MPlugin extends JavaPlugin {
// Listeners // Listeners
private MPluginSecretPlayerListener mPluginSecretPlayerListener; private MPluginSecretPlayerListener mPluginSecretPlayerListener;
private MPluginSecretServerListener mPluginSecretServerListener;
// Our stored base commands // Our stored base commands
private List<MCommand<?>> baseCommands = new ArrayList<MCommand<?>>(); private List<MCommand<?>> baseCommands = new ArrayList<MCommand<?>>();
@ -98,11 +97,9 @@ public abstract class MPlugin extends JavaPlugin {
} catch (ClassCastException ex) { } catch (ClassCastException ex) {
} }
// Create and register listeners // Create and register player command listener
this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this); this.mPluginSecretPlayerListener = new MPluginSecretPlayerListener(this);
this.mPluginSecretServerListener = new MPluginSecretServerListener(this);
getServer().getPluginManager().registerEvents(this.mPluginSecretPlayerListener, this); getServer().getPluginManager().registerEvents(this.mPluginSecretPlayerListener, this);
getServer().getPluginManager().registerEvents(this.mPluginSecretServerListener, this);
// Register recurring tasks // Register recurring tasks
if (saveTask == null && Conf.saveToFileEveryXMinutes > 0.0) { if (saveTask == null && Conf.saveToFileEveryXMinutes > 0.0) {

27
src/main/java/com/massivecraft/factions/zcore/MPluginSecretServerListener.java
View File

@ -1,27 +0,0 @@
package com.massivecraft.factions.zcore;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.server.ServerCommandEvent;
public class MPluginSecretServerListener implements Listener {
private MPlugin p;
public MPluginSecretServerListener(MPlugin p) {
this.p = p;
}
@EventHandler(priority = EventPriority.LOWEST)
public void onServerCommand(ServerCommandEvent event) {
if (event.getCommand().length() == 0) {
return;
}
if (p.handleCommand(event.getSender(), event.getCommand())) {
event.setCommand(p.refCommand);
}
}
}