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
2025-05-09 00:26:46 -04:00
parent 27c4210482 34151f13d6
commit 4761ca6c92
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/logic/LExecutor.java
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;

4
servers_v7.json
View File

@@ -223,10 +223,8 @@
{ {
"name": "Realm of Serene Lime", "name": "Realm of Serene Lime",
"address": [ "address": [
"mindustry.icu",
"sx.mindustry.icu",
"9k38.igla.pics", "9k38.igla.pics",
"frp-oak.com:26979" "106rjpd737504.vicp.fun:6568"
] ]
}, },
{ {