Merge branch 'master' of github.com:sk89q/commandhelper

Author: LadyCailin

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassDiscovery.java

@@ -565,7 +565,7 @@ public boolean doesClassExtend(ClassMirror subClass, Class superClass){
 						return true;
 					} else {
 						//We need to add change the reference to su
-						su = new ClassReferenceMirror("L" + clazz.getSuperclass().getName().replace(".", "/") + ";");
+						su = new ClassReferenceMirror("L" + clazz.getSuperclass().getName().replace('.', '/') + ";");
 					}
 				} catch (ClassNotFoundException ex) {
 					//Hmm, ok? I guess something bad happened, so let's break
@@ -593,7 +593,7 @@ public boolean doesClassExtend(ClassMirror subClass, Class superClass){
 				try {
 					Class clazz = Class.forName(r.toString());
 					for (Class c : clazz.getInterfaces()) {
-						interfaces.add(new ClassReferenceMirror("L" + c.getName().replace(".", "/") + ";"));
+						interfaces.add(new ClassReferenceMirror("L" + c.getName().replace('.', '/') + ";"));
 					}
 				} catch (ClassNotFoundException ex) {
 					return false;

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassMirror/ClassMirror.java

@@ -139,7 +139,7 @@ public String getJVMClassName(){
 	 */
 	public String getClassName(){
 		if(underlyingClass != null){
-			return underlyingClass.getName().replace("$", ".");
+			return underlyingClass.getName().replace('$', '.');
 		}
 		return info.name.replaceAll("[/$]", ".");
 	}
@@ -453,7 +453,7 @@ public boolean directlyExtendsFrom(Class superClass){
 		if(underlyingClass != null){
 			return (underlyingClass.getSuperclass() == superClass);
 		}
-		String name = superClass.getName().replace(".", "/");
+		String name = superClass.getName().replace('.', '/');
 		if(info.superClass.equals(name)){
 			return true;
 		}

src/main/java/com/laytonsmith/PureUtilities/Common/ClassUtils.java

@@ -157,7 +157,7 @@ private static Class forCanonicalName(String className, boolean useInitializer,
 	public static String getJVMName(Class clazz){
 		//For arrays, .getName() is fine.
 		if(clazz.isArray()){
-			return clazz.getName().replace(".", "/");
+			return clazz.getName().replace('.', '/');
 		}
 		if(clazz == boolean.class){
 			return "Z";
@@ -176,7 +176,7 @@ public static String getJVMName(Class clazz){
 		} else if(clazz == char.class){
 			return "C";
 		} else {
-			return "L" + clazz.getName().replace(".", "/") + ";";
+			return "L" + clazz.getName().replace('.', '/') + ";";
 		}
 	}
 
@@ -231,7 +231,7 @@ public static String getCommonNameFromJVMName(String classname){
 		} else if("V".equals(classname)){
 			return "void"; //special case
 		} else {
-			classname = classname.substring(1, classname.length() - 1).replace("/", ".").replace("$", ".");
+			classname = classname.substring(1, classname.length() - 1).replace('/', '.').replace('$', '.');
 		}
 		return classname + StringUtils.stringMultiply(arrayCount, "[]");
 	}

src/main/java/com/laytonsmith/PureUtilities/TermColors.java

@@ -196,7 +196,7 @@ private static String special(String type){
             }
         }
 		if(type.equals("reset")){
-			return "\033[0m";
+			return "\033[m";
 		}
         return "";
     }

src/main/java/com/laytonsmith/PureUtilities/VirtualFS/RealFileSystemLayer.java

@@ -61,7 +61,7 @@ public VirtualFile[] listFiles() throws IOException {
 
 	private VirtualFile normalize(File real) throws IOException {
 		String path = real.getCanonicalPath().replaceFirst(Pattern.quote(fileSystem.root.getCanonicalPath()), "");
-		path = path.replace("\\", "/");
+		path = path.replace('\\', '/');
 		if (!path.startsWith("/")) {
 			path = "/" + path;
 		}

src/main/java/com/laytonsmith/PureUtilities/VirtualFS/VirtualFile.java

@@ -19,7 +19,7 @@ public class VirtualFile {
 
 	public VirtualFile(String path){
 		String working = path;
-		working = working.replace("\\", "/");
+		working = working.replace('\\', '/');
 		for(String s : RESTRICTED_CHARS){
 			if(working.contains(s)){
 				throw new InvalidVirtualFile("VirtualFiles cannot contain the '" + s + "' character.");

src/main/java/com/laytonsmith/PureUtilities/ZipReader.java

@@ -97,7 +97,7 @@ public ZipReader(File file){
 			String newFile = file.getPath().substring(5);
 			//Replace all \ with /, to simply processing, but also replace ! with /, since jar addresses
 			//use that to denote the jar. We don't care, it's just a folder, so replace that with a slash.
-			newFile = newFile.replace("\\", "/").replace("!", "/");
+			newFile = newFile.replace('\\', '/').replace('!', '/');
 			while(newFile.startsWith("//")){
 				//We only want up to one slash here
 				newFile = newFile.substring(1);

src/main/java/com/laytonsmith/abstraction/AbstractConvertor.java

@@ -194,6 +194,9 @@ public void run() {
 					task.run();
 					if(!repeater){
 						unregister();
+						synchronized(tasks){
+							tasks.remove(id);
+						}
 					}
 				}
 			}, initialDelay, interval);

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommand.java

@@ -16,7 +16,6 @@
 import com.laytonsmith.core.constructs.Construct;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.environments.CommandHelperEnvironment;
-import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.events.Driver;
 import com.laytonsmith.core.events.EventUtils;
 import com.laytonsmith.core.exceptions.ConfigRuntimeException;
@@ -209,11 +208,11 @@ public List<String> handleTabComplete(MCCommandSender sender, String alias, Stri
 			for (String arg : args) {
 				cargs.push(new CString(arg, t), t);
 			}
+			CClosure closure = Commands.onTabComplete.get(cmd.getName().toLowerCase());
 			try {
-				Commands.onTabComplete.get(cmd.getName().toLowerCase()).execute(new Construct[]{
-					new CString(alias, t), new CString(sender.getName(), t), cargs,
-					new CArray(t) // reserved for an obgen style command array
-				});
+				closure.execute(new CString(alias, t), new CString(sender.getName(), t), cargs,
+						new CArray(t) // reserved for an obgen style command array
+				);
 			} catch (FunctionReturnException e) {
 				Construct fret = e.getReturn();
 				if (fret instanceof CArray) {
@@ -229,10 +228,12 @@ public List<String> handleTabComplete(MCCommandSender sender, String alias, Stri
 					}
 					return ret;
 				}
+			} catch (ConfigRuntimeException cre){
+				ConfigRuntimeException.HandleUncaughtException(cre, closure.getEnv());
+				return new ArrayList<>();
 			}
 		}
 		BukkitMCCommandTabCompleteEvent event = new BukkitMCCommandTabCompleteEvent(sender, cmd, alias, args);
-		EventUtils.TriggerExternal(event);
 		EventUtils.TriggerListener(Driver.TAB_COMPLETE, "tab_complete_command", event);
 		return event.getCompletions();
 	}
@@ -255,10 +256,9 @@ public boolean handleCustomCommand(MCCommandSender sender, String label, String[
 			}
 
 			try {
-				closure.execute(new Construct[]{
-					new CString(label, t), new CString(sender.getName(), t), cargs,
-					new CArray(t) // reserved for an obgen style command array
-				});
+				closure.execute(new CString(label, t), new CString(sender.getName(), t), cargs,
+						new CArray(t) // reserved for an obgen style command array
+				);
 			} catch (FunctionReturnException e) {
 				Construct fret = e.getReturn();
 				if (fret instanceof CBoolean) {

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCProjectile.java

@@ -48,8 +48,12 @@ public void setBounce(boolean doesBounce) {
 	}
 
 	@Override
-	public void setShooter(MCProjectileSource shooter) {
-		proj.setShooter((ProjectileSource) shooter.getHandle());
+	public void setShooter(MCProjectileSource shooter){
+		if(shooter == null){
+			proj.setShooter(null);
+		} else {
+			proj.setShooter((ProjectileSource) shooter.getHandle());
+		}
 	}
 
 	public Projectile asProjectile() {