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

Prevent setting counter to null using write instruction (#10774)

Browse Source 
* Prevent setting counter to null using write instruction

* Reset isobj flag on counter on every instruction
This commit is contained in:
Cardillan
2025-05-07 23:26:30 -04:00
committed by GitHub
parent 0a7210417b
commit 34151f13d6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/logic/LExecutor.java
+3 -4
View File
@@ -88,6 +88,7 @@ public class LExecutor{
} }
if(counter.numval < instructions.length){ if(counter.numval < instructions.length){
counter.isobj = false;
instructions[(int)(counter.numval++)].run(this); instructions[(int)(counter.numval++)].run(this);
} }
} }
@@ -781,10 +782,8 @@ public class LExecutor{
public void run(LExecutor exec){ public void run(LExecutor exec){
if(!to.constant){ if(!to.constant){
if(from.isobj){ if(from.isobj){
if(to != exec.counter){ to.objval = from.objval;
to.objval = from.objval; to.isobj = true;
to.isobj = true;
}
}else{ }else{
to.numval = LVar.invalid(from.numval) ? 0 : from.numval; to.numval = LVar.invalid(from.numval) ? 0 : from.numval;
to.isobj = false; to.isobj = false;