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

Merge remote branch 'remotes/origin/master' into release

Browse source
This commit is contained in:
KHobbits 2011-12-19 05:04:15 +00:00
commit cbd5b6c0f4
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ public class Essentials extends JavaPlugin implements IEssentials
LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName())); LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
} }
} }
final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*").matcher(getServer().getVersion()); final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-b([0-9]+)jnks.*").matcher(getServer().getVersion());
if (versionMatch.matches()) if (versionMatch.matches())
{ {
final int versionNumber = Integer.parseInt(versionMatch.group(4)); final int versionNumber = Integer.parseInt(versionMatch.group(4));
@ -294,7 +294,7 @@ public class Essentials extends JavaPlugin implements IEssentials
public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module) public boolean onCommandEssentials(final CommandSender sender, final Command command, final String commandLabel, final String[] args, final ClassLoader classLoader, final String commandPath, final String permissionPrefix, final IEssentialsModule module)
{ {
// Allow plugins to override the command via onCommand // Allow plugins to override the command via onCommand
if (!getSettings().isCommandOverridden(command.getName()) && !commandLabel.startsWith("e")) if (!getSettings().isCommandOverridden(command.getName()) && (!commandLabel.startsWith("e") || commandLabel.equalsIgnoreCase(command.getName())))
{ {
final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel); final PluginCommand pc = alternativeCommandsHandler.getAlternative(commandLabel);
if (pc != null) if (pc != null)

5
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -313,10 +313,7 @@ public class EssentialsPlayerListener extends PlayerListener
} }
else if (command.startsWith("c:")) else if (command.startsWith("c:"))
{ {
for (Player p : server.getOnlinePlayers()) user.chat(command.substring(2));
{
p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
}
} }
else else
{ {