From f4940fffab1d37e5de2a52582b85cd725f59e355 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 23 Jan 2020 18:33:32 -0500 Subject: [PATCH] Minor tweaks --- core/src/mindustry/content/TechTree.java | 3 ++- core/src/mindustry/mod/Scripts.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 574c3a18f2..d55eb68623 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -201,6 +201,8 @@ public class TechTree implements ContentList{ node(liquidRouter, () -> { node(liquidTank); + node(bridgeConduit); + node(pulseConduit, () -> { node(phaseConduit, () -> { @@ -217,7 +219,6 @@ public class TechTree implements ContentList{ }); }); }); - node(bridgeConduit); }); }); }); diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 075469f24f..546a3e7828 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", "mod.scripts", "classloader"); + ".awt", "socket", "mod.scripts", "classloader", "oracle"); private final Array whitelist = Array.with("mindustry.net"); private final Context context; private final String wrapper;