Merge remote-tracking branch 'origin/master'

2020-12-14 13:42:52 -05:00
parent cec1eb5608 1c6ebd3f6a
commit ff93c21269
2 changed files with 1 additions and 10 deletions
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -778,7 +778,7 @@ public class LExecutor{
                Var va = exec.var(a);
                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
                    exec.setnum(dest, op.objFunction2.get(exec.obj(a), exec.obj(b)));
                }else{