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

Fixed #2178

Browse Source
This commit is contained in:
Anuken
2020-06-20 09:07:35 -04:00
parent f419de0fad
commit ec4a5880b7
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/.temp/e3bbe745/libarc-discord64.so
View File

Binary file not shown.

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

@@ -23,17 +23,6 @@ public class TechTree implements ContentList{
map = new ObjectMap<>(); map = new ObjectMap<>();
all = new Seq<>(); all = new Seq<>();
root = node(coreShard, () -> {
node(Items.lead, () -> {
});
node(Items.copper, () -> {
});
});
if(false)
root = node(coreShard, () -> { root = node(coreShard, () -> {
node(conveyor, () -> { node(conveyor, () -> {

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

@@ -92,7 +92,9 @@ public class Scripts implements Disposable{
//inject script info into file (TODO maybe rhino handles this?) //inject script info into file (TODO maybe rhino handles this?)
context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null); context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null);
} }
context.evaluateString(scope, script, file, 1, null); context.evaluateString(scope,
"(function(){\n" +script + "\n})();",
file, 0, null);
return true; return true;
}catch(Throwable t){ }catch(Throwable t){
if(currentMod != null){ if(currentMod != null){