Merge remote-tracking branch 'origin/master'

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{

servers.json

@@ -53,15 +53,6 @@
   {
     "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"
   },