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-12-14 13:42:52 -05:00
parent cec1eb5608 1c6ebd3f6a
commit ff93c21269
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,7 @@ public class LExecutor{
Var va = exec.var(a); Var va = exec.var(a);
Var vb = exec.var(b); Var vb = exec.var(b);
if(op.objFunction2 != null && (va.isobj || vb.isobj)){ if(op.objFunction2 != null && va.isobj && vb.isobj){
//use object function if provided, and one of the variables is an object //use object function if provided, and one of the variables is an object
exec.setnum(dest, op.objFunction2.get(exec.obj(a), exec.obj(b))); exec.setnum(dest, op.objFunction2.get(exec.obj(a), exec.obj(b)));
}else{ }else{

9
servers.json
View File

@@ -53,15 +53,6 @@
{ {
"address": "twsmindustry.24x7.hk:6568" "address": "twsmindustry.24x7.hk:6568"
}, },
{
"address": "Chaotic-Neutral.ddns.net:1111"
},
{
"address": "Chaotic-Neutral.ddns.net:4444"
},
{
"address": "Chaotic-Neutral.ddns.net:3333"
},
{ {
"address": "mindustryranked.ddns.net" "address": "mindustryranked.ddns.net"
}, },