Fixed block team change not processing correctly

2022-03-02 14:46:14 -05:00
parent 804fce06e7
commit b48f350914
2 changed files with 13 additions and 7 deletions
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1527,10 +1527,16 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
    /** Changes this building's team in a safe manner. */
    public void changeTeam(Team next){
        Team last = this.team;
-        indexer.removeIndex(tile);
+        boolean was = isValid();
+
+        if(was) indexer.removeIndex(tile);
+
        this.team = next;
-        indexer.addIndex(tile);
-        Events.fire(teamChangeEvent.set(last, self()));
+
+        if(was){
+            indexer.addIndex(tile);
+            Events.fire(teamChangeEvent.set(last, self()));
+        }
    }

    public boolean canPickup(){