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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-07-28 14:29:14 -04:00
parent c6826a6c7e 101a4c2f65
commit be530abd4b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ public class Scripts implements Disposable{
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, context.evaluateString(scope,
wrap ? "(function(){\n" + script + "\n})();" : script, wrap ? "(function(){'use strict';\n" + script + "\n})();" : script,
file, 0, null); file, 0, null);
return true; return true;
}catch(Throwable t){ }catch(Throwable t){

2
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -88,7 +88,7 @@ public class Sorter extends Block{
boolean isSame(Building other){ boolean isSame(Building other){
//uncomment code below to prevent sorter/gate chaining //uncomment code below to prevent sorter/gate chaining
return other != null && (other.block() instanceof Sorter/* || other.block() instanceof OverflowGate */); return other != null && (other.block() instanceof Sorter || other.block() instanceof OverflowGate);
} }
Building getTileTarget(Item item, Building source, boolean flip){ Building getTileTarget(Item item, Building source, boolean flip){