Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/mindustry/logic/LCanvas.java
This commit is contained in:
Anuken
2020-11-02 16:47:33 -05:00
10 changed files with 31 additions and 59 deletions

View File

@@ -324,7 +324,8 @@ public class LogicBlock extends Block{
executor.load(asm);
}catch(Exception e){
e.printStackTrace();
Log.err("Failed to compile logic program @", code);
Log.err(e);
//handle malformed code and replace it with nothing
executor.load("", LExecutor.maxInstructions);