Titanium fuse ammo

This commit is contained in:
Anuken
2020-10-20 12:14:53 -04:00
parent 9a9b1d1a90
commit 82fe66b931
4 changed files with 17 additions and 5 deletions

View File

@@ -1,7 +1,10 @@
package mindustry.logic;
import mindustry.game.*;
/** An object that can be controlled with logic. */
public interface Controllable{
void control(LAccess type, double p1, double p2, double p3, double p4);
void control(LAccess type, Object p1, double p2, double p3, double p4);
Team team();
}

View File

@@ -510,7 +510,7 @@ public class LExecutor{
@Override
public void run(LExecutor exec){
Object obj = exec.obj(target);
if(obj instanceof Controllable cont){
if(obj instanceof Controllable cont && cont.team() == exec.team){
if(type.isObj){
cont.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4));
}else{