From 63d84bead3041bcecb1fd3de5ef83aa92205caf2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 31 Jan 2020 20:10:21 -0500 Subject: [PATCH] Cleanup --- android/src/mindustry/android/AndroidLauncher.java | 1 + core/src/mindustry/entities/type/Player.java | 1 - core/src/mindustry/mod/Scripts.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 561ce0b998..6faa60a9ee 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -177,6 +177,7 @@ public class AndroidLauncher extends AndroidApplication{ } //create marker Core.files.local("files_moved").writeString("files moved to " + data); + Core.files.local("files_moved_103").writeString("files moved again"); Log.info("Files moved."); }catch(Throwable t){ Log.err("Failed to move files!"); diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index f9ccb7dfd3..34ce3fcbe3 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -36,7 +36,6 @@ import static mindustry.Vars.*; public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public static final int timerSync = 2; public static final int timerAbility = 3; - public static final int timerTransfer = 4; private static final int timerShootLeft = 0; private static final int timerShootRight = 1; private static final float liftoffBoost = 0.2f; diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 6d70437dbb..94acd92eb4 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -12,7 +12,7 @@ import org.mozilla.javascript.*; public class Scripts implements Disposable{ private final Array blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system", - ".awt", "socket", "classloader", "oracle"); + ".awt", "socket", "classloader", "oracle", "invoke"); private final Array whitelist = Array.with("mindustry.net"); private final Context context; private final String wrapper;