Movement

2020-02-07 13:02:24 -05:00
parent 861b3ac3f4
commit 4265d40024
6 changed files with 29 additions and 5 deletions
--- a/core/src/mindustry/entities/def/PlayerComp.java
+++ b/core/src/mindustry/entities/def/PlayerComp.java
@@ -96,6 +96,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{

    public void unit(Unitc unit){
        if(unit == null) throw new IllegalArgumentException("Unit cannot be null. Use clearUnit() instead.");
+        if(this.unit != Nulls.unit){
+            //un-control the old unit
+            this.unit.controller(this.unit.type().createController());
+        }
        this.unit = unit;
        if(unit != Nulls.unit){
            unit.team(team);