Fix players hit "delete-unit" because of animation

Longwelwind · Jun 24, 2024 · 2bcde32 · 2bcde32
1 parent dc13ea3
commit 2bcde32
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/...r/src/common/ingame-game-state/draft-game-state/draft-map-game-state/DraftMapGameState.ts b/...r/src/common/ingame-game-state/draft-game-state/draft-map-game-state/DraftMapGameState.ts
@@ -98,15 +98,17 @@ export default class DraftMapGameState extends GameState<DraftGameState> {
         } else if (message.type == "select-units") {
             if (!this.parentGameState.participatingHouses.includes(player.house)) return;
 
-            const unitId = _.flatMap(message.units.map(([_rid, units]) => units));
+            const unitIds = _.flatMap(message.units.map(([_rid, units]) => units));
+            if (unitIds.length != 1) return;
 
-            if (unitId.length != 1) {
-                return;
-            }
+            const unitId = unitIds[0];
+            const region = this.world.regions.values.find(r => r.units.has(unitId));
 
-            const unit = this.world.getUnitById(unitId[0]);
-            this.ingame.broadcastRemoveUnits(unit.region, [unit], true);
-            unit.region.units.delete(unit.id);
+            if (region) {
+                const unit = region.units.get(unitId);
+                this.ingame.broadcastRemoveUnits(unit.region, [unit], true);
+                unit.region.units.delete(unit.id);
+            }
         } else if (message.type == "muster") {
             const house = player.house;
             if (!this.parentGameState.participatingHouses.includes(house)) return;