Do not accidentally build barracks in the sea.

GitOrigin-RevId: 962c88cbec0b61e53bb9af280c8441e0b611a14f
nkzw-tech · Nov 15, 2024 · 1f7495e · 1f7495e
1 parent 8662b2e
commit 1f7495e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/athena/lib/couldSpawnBuilding.tsx b/athena/lib/couldSpawnBuilding.tsx
@@ -1,5 +1,6 @@
 import getFirstOrThrow from '@deities/hephaestus/getFirstOrThrow.tsx';
 import { BuildingInfo } from '../info/Building.tsx';
+import { Plain } from '../info/Tile.tsx';
 import { PlayerID } from '../map/Player.tsx';
 import Vector from '../map/Vector.tsx';
 import MapData from '../MapData.tsx';
@@ -12,16 +13,15 @@ export default function couldSpawnBuilding(
   building: BuildingInfo,
   player: PlayerID,
 ) {
-  const { editorPlaceOn, placeOn } = building.configuration;
-  const tiles = new Set([...(placeOn || []), ...editorPlaceOn]);
-  if (!tiles.has(map.getTileInfo(vector))) {
+  if (map.getTileInfo(vector) === Plain) {
+    const { editorPlaceOn, placeOn } = building.configuration;
     const tileMap = map.map.slice();
     const modifiers = map.modifiers.slice();
     writeTile(
       tileMap,
       modifiers,
       map.getTileIndex(vector),
-      getFirstOrThrow(tiles),
+      getFirstOrThrow(new Set([...(placeOn || []), ...editorPlaceOn])),
     );
     map = map.copy({
       map: tileMap,