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

Minor tweaks

Browse Source
This commit is contained in:
Anuken
2020-01-23 18:33:32 -05:00
parent d031efe1f2
commit f4940fffab
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/TechTree.java
View File

@@ -201,6 +201,8 @@ public class TechTree implements ContentList{
node(liquidRouter, () -> { node(liquidRouter, () -> {
node(liquidTank); node(liquidTank);
node(bridgeConduit);
node(pulseConduit, () -> { node(pulseConduit, () -> {
node(phaseConduit, () -> { node(phaseConduit, () -> {
@@ -217,7 +219,6 @@ public class TechTree implements ContentList{
}); });
}); });
}); });
node(bridgeConduit);
}); });
}); });
}); });

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", "mod.scripts", "classloader"); ".awt", "socket", "mod.scripts", "classloader", "oracle");
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;