Only info not a warning if a file is missing

Correctly match release and non release versions of bukkit.
Fix sending our player object to other plugins.
2026-11-08 10:15:18 -05:00 · 2011-12-20 12:25:30 +01:00 · 2011-12-20 12:20:41 +01:00 · 2011-12-20 11:57:51 +01:00 · 2011-12-19 12:07:28 +01:00 · 2011-12-19 10:57:44 +00:00
6 changed files with 17 additions and 12 deletions
@@ -124,7 +124,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 				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]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
 		if (versionMatch.matches())
 		{
 			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)
 	{
 		// 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);
 			if (pc != null)
@@ -313,10 +313,7 @@ public class EssentialsPlayerListener extends PlayerListener
 			}
 			else if (command.startsWith("c:"))
 			{
-				for (Player p : server.getOnlinePlayers())
-				{
-					p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
-				}
+				user.chat(command.substring(2));
 			}
 			else
 			{
@@ -59,7 +59,12 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			{
 				throw new Exception(_("jailNotExist"));
 			}
-			return getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
+			Location loc = getData().getJails().get(jailName.toLowerCase(Locale.ENGLISH));
+			if (loc == null || loc.getWorld() == null)
+			{
+				throw new Exception(_("jailNotExist"));
+			}
+			return loc;
 		}
 		finally
 		{
@@ -111,7 +116,8 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		{
 			if (!(user.getBase() instanceof OfflinePlayer))
 			{
-				user.getTeleport().now(getJail(jail), false, TeleportCause.COMMAND);
+				Location loc = getJail(jail);
+				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
 			}
 			user.setJail(jail);
 		}
@@ -31,7 +31,7 @@ public class Commandbreak extends EssentialsCommand
 		{
 			throw new Exception("You are not allowed to destroy bedrock."); //TODO: Translation
 		}
-		final BlockBreakEvent event = new BlockBreakEvent(block, user);
+		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
 		server.getPluginManager().callEvent(event);
 		if (event.isCancelled())
 		{
@@ -20,6 +20,10 @@ public class Commandsetwarp extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		
+		if (args[0].matches("[0-9]+")) {
+			throw new NotEnoughArgumentsException();
+		}

 		final Location loc = user.getLocation();
 		ess.getWarps().setWarp(args[0], loc);
@@ -6,10 +6,8 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
-import org.yaml.snakeyaml.error.YAMLException;


 public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> implements Runnable
@@ -56,7 +54,7 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp
 		catch (FileNotFoundException ex)
 		{
 			onException();
-			Bukkit.getLogger().log(Level.WARNING, "File not found: " + file.toString());
+			Bukkit.getLogger().log(Level.INFO, "File not found: " + file.toString());
 		}
 		catch (ObjectLoadException ex)
 		{
Author	SHA1	Message	Date
snowleo	4425d53664	Only info not a warning if a file is missing	2011-12-20 12:25:30 +01:00
snowleo	ee5e015a63	Correctly match release and non release versions of bukkit.	2011-12-20 12:20:41 +01:00
snowleo	839ce3d526	Fix sending our player object to other plugins.	2011-12-20 11:57:51 +01:00
snowleo	cc06117210	Merge branch 'refs/heads/master' into release	2011-12-19 12:07:28 +01:00
KHobbits	5a092f0e99	Merge branch 'master' of github.com:essentials/Essentials	2011-12-19 10:57:44 +00:00
KHobbits	98cd03ac57	Prevent future warps being named as numbers.	2011-12-19 10:57:18 +00:00
snowleo	8761feb93f	More null checks for Jails	2011-12-19 11:53:52 +01:00
KHobbits	cbd5b6c0f4	Merge remote branch 'remotes/origin/master' into release	2011-12-19 05:04:15 +00:00
KHobbits	fec3b61039	Merge branch 'master' of github.com:essentials/Essentials	2011-12-15 20:47:24 +00:00
KHobbits	01530192cf	Make powertool use a chat event, instead of just messaging each user.	2011-12-15 20:47:06 +00:00
snowleo	64bc8d1133	Corrected version match for 1597 build version	2011-12-15 10:32:04 +01:00
snowleo	58bebd851c	Fix failing override for /enchant /eco /ext	2011-12-14 15:07:08 +01:00