Merge pull request #375 from PseudoKnight/fixes

Fixes

Author: LadyCailin

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

@@ -871,29 +871,26 @@ public Vector3D vector(Vector3D v, Construct c, Target t) {
 					x = Static.getNumber(va.get(0, t), t);
 					y = Static.getNumber(va.get(1, t), t);
 					z = Static.getNumber(va.get(2, t), t);
-				} else
-				if(va.size() == 2) { // 2nd dimension vector
+				} else if(va.size() == 2){ // 2nd dimension vector
 					x = Static.getNumber(va.get(0, t), t);
 					y = Static.getNumber(va.get(1, t), t);
-					z = 0;
-				} else {
-					throw new ConfigRuntimeException("Expecting a Vector array, but the array did not meet the format specifications", ExceptionType.FormatException, t);
+				} else if(va.size() == 1){
+					x = Static.getNumber(va.get(0, t), t);
+				}
+			} else {
+				if(va.containsKey("x")){
+					x = Static.getNumber(va.get("x", t), t);
+				}
+				if(va.containsKey("y")){
+					y = Static.getNumber(va.get("y", t), t);
+				}
+				if(va.containsKey("z")){
+					z = Static.getNumber(va.get("z", t), t);
 				}
-			}
-
-			if(va.containsKey("x")) {
-				x = Static.getNumber(va.get("x", t), t);
-			}
-			if(va.containsKey("y")) {
-				y = Static.getNumber(va.get("y", t), t);
-			}
-			if(va.containsKey("z")) {
-				z = Static.getNumber(va.get("z", t), t);
 			}
 
 			return new Vector3D(x, y, z);
-		} else
-		if(c instanceof CNull) {
+		} else if(c instanceof CNull) {
 			// fulfilling the todo?
 			return v;
 		} else {

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

@@ -1275,18 +1275,12 @@ public static void AssertNonNull(Object var, String message) throws NullPointerE
 	 * @throws URISyntaxException
 	 */
 	public static Environment GenerateStandaloneEnvironment() throws IOException, DataSourceException, URISyntaxException, Profiles.InvalidProfileException {
-		File jarLocation;
-		if (Static.class.getProtectionDomain().getCodeSource().getLocation() != null) {
-			jarLocation = new File(Static.class.getProtectionDomain().getCodeSource().getLocation().getFile()).getParentFile();
-		} else {
-			jarLocation = new File(".");
-		}
-		File platformFolder = new File(jarLocation, Implementation.GetServerType().getBranding() + "/");
+		File platformFolder = MethodScriptFileLocations.getDefault().getConfigDirectory();
 		Installer.Install(platformFolder);
 		ConnectionMixinFactory.ConnectionMixinOptions options = new ConnectionMixinFactory.ConnectionMixinOptions();
 		options.setWorkingDirectory(platformFolder);
 		PersistenceNetwork persistenceNetwork = new PersistenceNetwork(MethodScriptFileLocations.getDefault().getPersistenceConfig(),
-				new URI("sqlite://" + new File(platformFolder, "persistence.db").getCanonicalPath().replace("\\", "/")), options);
+				new URI("sqlite://" + new File(platformFolder, "persistence.db").getCanonicalPath().replace('\\', '/')), options);
 		GlobalEnv gEnv = new GlobalEnv(new MethodScriptExecutionQueue("MethodScriptExecutionQueue", "default"),
 				new Profiler(MethodScriptFileLocations.getDefault().getProfilerConfigFile()), persistenceNetwork, platformFolder,
 				new Profiles(MethodScriptFileLocations.getDefault().getProfilesFile()), new TaskManager());

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

@@ -1399,6 +1399,9 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 			CArray ca = (CArray) args[0];
 			CArray.SortType sortType = CArray.SortType.REGULAR;
 			CClosure customSort = null;
+			if(ca.size() <= 1){
+				return ca;
+			}
 			try {
 				if (args.length == 2) {
 					if(args[1] instanceof CClosure){