Browse Source

fixes for new snuvi core

Kajetan Johannes Hammerle 4 years ago
parent
commit
f4ed4b7261

+ 6 - 9
src/main/java/me/km/snuviscript/CommandScript.java

@@ -103,18 +103,15 @@ public class CommandScript extends Command {
                         try {
                             if(arg[1].equals("all")) {
                                 scripts.clearPlayerRegistry();
-                                if(scripts.getScriptManager().removeScriptsSafe()) {
-                                    sendMessage(cs, "All active scripts were terminated.");
-                                } else {
-                                    sendMessage(cs, "Iterating is not allowed currently.");
-                                }
+                                scripts.getScriptManager().removeScripts();
+                                sendMessage(cs, "All active scripts were terminated.");
                                 return;
                             }
                             int id = Integer.parseInt(arg[1]);
-                            Script qd = scripts.getScriptManager().getScript(id);
-                            if(qd != null) {
-                                scripts.getScriptManager().removeScriptSafe(qd);
-                                sendMessage(cs, String.format("Script '%s' was terminated.", qd.getName()));
+                            Script sc = scripts.getScriptManager().getScript(id);
+                            if(sc != null) {
+                                scripts.getScriptManager().removeScript(sc);
+                                sendMessage(cs, String.format("Script '%s' was terminated.", sc.getName()));
                             } else {
                                 sendMessage(cs, String.format("Script id '%d' is not valid.", id));
                             }

+ 1 - 1
src/main/java/me/km/snuviscript/Scripts.java

@@ -133,7 +133,7 @@ public class Scripts {
             if(sc != callingScript) {
                 manager.callEvent("player_kicked", sc, (innerSc) -> ScriptVars.setPlayerVars(innerSc, p), null);
             }
-            manager.removeScriptSafe(sc);
+            manager.removeScript(sc);
         }
         return b;
     }