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

Fixed #3644

Browse Source
This commit is contained in:
Anuken
2020-11-28 11:31:07 -05:00
parent 8a424111f0
commit 6e62859d0e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/logic/LAssembler.java
View File

@@ -14,7 +14,7 @@ import mindustry.world.*;
/** "Compiles" a sequence of statements into instructions. */ /** "Compiles" a sequence of statements into instructions. */
public class LAssembler{ public class LAssembler{
public static ObjectMap<String, Func<String[], LStatement>> customParsers = new ObjectMap<>(); public static ObjectMap<String, Func<String[], LStatement>> customParsers = new ObjectMap<>();
public static final int maxTokenLength = 40; public static final int maxTokenLength = 36;
private int lastVar; private int lastVar;
/** Maps names to variable IDs. */ /** Maps names to variable IDs. */

6
core/src/mindustry/ui/Bar.java
View File

@@ -29,7 +29,11 @@ public class Bar extends Element{
public Bar(Prov<String> name, Prov<Color> color, Floatp fraction){ public Bar(Prov<String> name, Prov<Color> color, Floatp fraction){
this.fraction = fraction; this.fraction = fraction;
lastValue = value = Mathf.clamp(fraction.get()); try{
lastValue = value = Mathf.clamp(fraction.get());
}catch(Exception e){ //getting the fraction may involve referring to invalid data
lastValue = value = 0f;
}
update(() -> { update(() -> {
try{ try{
this.name = name.get(); this.name = name.get();