TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 13:13:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix for calling command for plugins that are loaded after Essentials.

Browse source
This commit is contained in:
snowleo 2011-06-12 17:51:16 +02:00
parent ebc56c0e15
commit 6cc742b139
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -30,6 +30,7 @@ import com.earth2me.essentials.register.payment.Methods;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.bukkit.command.PluginCommand;
import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.craftbukkit.scheduler.CraftScheduler;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Priority;
@ -42,7 +43,7 @@ import org.bukkit.plugin.java.*;
public class Essentials extends JavaPlugin implements IEssentials public class Essentials extends JavaPlugin implements IEssentials
{ {
public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology"; public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology";
public static final int minBukkitBuildVersion = 860; public static final int minBukkitBuildVersion = 867;
private static final Logger logger = Logger.getLogger("Minecraft"); private static final Logger logger = Logger.getLogger("Minecraft");
private Settings settings; private Settings settings;
private TNTExplodeListener tntListener; private TNTExplodeListener tntListener;
@ -397,17 +398,10 @@ public class Essentials extends JavaPlugin implements IEssentials
continue; continue;
} }
if (!(desc.getCommands() instanceof Map)) PluginCommand pc = getServer().getPluginCommand(desc.getName()+":"+commandLabel);
{ if (pc != null) {
continue; return pc.execute(sender, commandLabel, args);
} }
Map<String, Object> cmds = (Map<String, Object>)desc.getCommands();
if (!cmds.containsKey(command.getName()))
{
continue;
}
return p.onCommand(sender, command, commandLabel, args);
} }
} }