Merge pull request #374 from PseudoKnight/fixes

Fixes

Author: PseudoKnight

src/main/java/com/laytonsmith/core/AliasCore.java

@@ -253,7 +253,11 @@ public final void reload(MCPlayer player, String[] settings) {
 			try {
 				results = reloadOptions.match(settings);
 			} catch (ArgumentParser.ValidationException ex) {
-				Logger.getLogger(AliasCore.class.getName()).log(Level.SEVERE, null, ex);
+				if (player != null) {
+					player.sendMessage(ex.getMessage());
+				} else {
+					StreamUtils.GetSystemOut().println(ex.getMessage());
+				}
 				return;
 			}
 			if (results.isFlagSet('h')) {

src/main/java/com/laytonsmith/core/Static.java

@@ -395,7 +395,7 @@ public static void checkPlugin(String name, Target t) throws ConfigRuntimeExcept
 	private static final Pattern INVALID_BINARY = Pattern.compile("\"0b[0-1]*[^0-1]+[0-1]*\"");
 	private static final Pattern VALID_BINARY = Pattern.compile("0b[0-1]+");
 	private static final Pattern INVALID_OCTAL = Pattern.compile("0o[0-7]*[^0-7]+[0-7]*");
-	private static final Pattern VALID_OCTAL = Pattern.compile("0b[0-1]+");
+	private static final Pattern VALID_OCTAL = Pattern.compile("0o[0-7]+");
 
 	/**
 	 * Given a string input, creates and returns a Construct of the appropriate

src/main/java/com/laytonsmith/core/functions/InventoryManagement.java

@@ -715,10 +715,11 @@ public String docs() {
         }
 
 		@Override
-        public Exceptions.ExceptionType[] thrown() {
-            return new Exceptions.ExceptionType[]{Exceptions.ExceptionType.CastException, Exceptions.ExceptionType.FormatException,
-                Exceptions.ExceptionType.PlayerOfflineException, ExceptionType.NotFoundException};
-        }
+		public ExceptionType[] thrown() {
+			return new ExceptionType[]{ExceptionType.CastException, ExceptionType.FormatException,
+					ExceptionType.PlayerOfflineException, ExceptionType.NotFoundException,
+					ExceptionType.IllegalArgumentException};
+		}
 
 		@Override
         public boolean isRestricted() {
@@ -759,7 +760,12 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 				meta = ObjectGenerator.GetGenerator().itemMeta(CNull.NULL, is.getType(), t);
 			}
 			is.setItemMeta(meta);
-			Map<Integer, MCItemStack> h = p.getInventory().addItem(is);
+			Map<Integer, MCItemStack> h;
+			try {
+				h = p.getInventory().addItem(is);
+			} catch(IllegalArgumentException e) {
+				throw new ConfigRuntimeException("Item value is invalid", ExceptionType.IllegalArgumentException, t);
+			}
 
 			p.updateInventory();
 
@@ -895,9 +901,10 @@ public String docs() {
 		}
 
 		@Override
-		public Exceptions.ExceptionType[] thrown() {
-			return new Exceptions.ExceptionType[]{Exceptions.ExceptionType.CastException, Exceptions.ExceptionType.FormatException,
-				Exceptions.ExceptionType.PlayerOfflineException, ExceptionType.NotFoundException};
+		public ExceptionType[] thrown() {
+			return new ExceptionType[]{ExceptionType.CastException, ExceptionType.FormatException,
+					ExceptionType.PlayerOfflineException, ExceptionType.NotFoundException,
+					ExceptionType.IllegalArgumentException};
 		}
 
 		@Override
@@ -940,7 +947,12 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 				meta = ObjectGenerator.GetGenerator().itemMeta(CNull.NULL, is.getType(), t);
 			}
 			is.setItemMeta(meta);
-			Map<Integer, MCItemStack> h = p.getEnderChest().addItem(is);
+			Map<Integer, MCItemStack> h;
+			try {
+				h = p.getEnderChest().addItem(is);
+			} catch(IllegalArgumentException e) {
+				throw new ConfigRuntimeException("Item value is invalid", ExceptionType.IllegalArgumentException, t);
+			}
 
 			if (h.isEmpty()) {
 				return new CInt(0, t);
@@ -1734,7 +1746,7 @@ public String docs() {
 		@Override
 		public ExceptionType[] thrown() {
 			return new ExceptionType[]{ExceptionType.CastException, ExceptionType.FormatException,
-                    ExceptionType.LengthException};
+                    ExceptionType.LengthException, ExceptionType.IllegalArgumentException};
 		}
 
 		@Override
@@ -1766,7 +1778,12 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 				meta = ObjectGenerator.GetGenerator().itemMeta(CNull.NULL, is.getType(), t);
 			}
 			is.setItemMeta(meta);
-			Map<Integer, MCItemStack> h = inventory.addItem(is);
+			Map<Integer, MCItemStack> h;
+			try {
+				h = inventory.addItem(is);
+			} catch(IllegalArgumentException e){
+				throw new ConfigRuntimeException("Item value is invalid", ExceptionType.IllegalArgumentException, t);
+			}
 
 			if (h.isEmpty()) {
 				return new CInt(0, t);

src/main/java/com/laytonsmith/core/functions/Scoreboards.java

@@ -483,7 +483,7 @@ public Construct exec(Target t, Environment environment,
 				throw new Exceptions.LengthException("Objective names should be no more than 16 characters", t);
 			}
 			MCCriteria criteria = MCCriteria.DUMMY;
-			if (args.length == 2) {
+			if (args.length > 1) {
 				try {
 					criteria = MCCriteria.valueOf(args[1].val().toUpperCase());
 				} catch (IllegalArgumentException iae) {