Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-01-31 20:10:21 -05:00
parent 51b4824c92
commit 63d84bead3
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/src/mindustry/android/AndroidLauncher.java
View File

@@ -177,6 +177,7 @@ public class AndroidLauncher extends AndroidApplication{
} }
//create marker //create marker
Core.files.local("files_moved").writeString("files moved to " + data); Core.files.local("files_moved").writeString("files moved to " + data);
Core.files.local("files_moved_103").writeString("files moved again");
Log.info("Files moved."); Log.info("Files moved.");
}catch(Throwable t){ }catch(Throwable t){
Log.err("Failed to move files!"); Log.err("Failed to move files!");

1
core/src/mindustry/entities/type/Player.java
View File

@@ -36,7 +36,6 @@ import static mindustry.Vars.*;
public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
public static final int timerSync = 2; public static final int timerSync = 2;
public static final int timerAbility = 3; public static final int timerAbility = 3;
public static final int timerTransfer = 4;
private static final int timerShootLeft = 0; private static final int timerShootLeft = 0;
private static final int timerShootRight = 1; private static final int timerShootRight = 1;
private static final float liftoffBoost = 0.2f; private static final float liftoffBoost = 0.2f;

2
core/src/mindustry/mod/Scripts.java
View File

@@ -12,7 +12,7 @@ import org.mozilla.javascript.*;
public class Scripts implements Disposable{ public class Scripts implements Disposable{
private final Array<String> blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", private final Array<String> 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", "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<String> whitelist = Array.with("mindustry.net"); private final Array<String> whitelist = Array.with("mindustry.net");
private final Context context; private final Context context;
private final String wrapper; private final String wrapper;