Add condition Hash for start layer (#1506)

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-05 23:34:18 +02:00
parent 908b78fdda
commit 358d9a79d3
3 changed files with 181 additions and 4 deletions
@@ -55,10 +55,13 @@ export class StartPositionCalculator {
        for (const layer of this.gameMap.flatLayers) {
            if (layer.type !== "tilelayer") continue;
            //we want to prioritize the selectedLayer other the start layer
-            if (selectedOrDefaultLayer === layer.name || layer.name.endsWith("/" + selectedOrDefaultLayer)) {
-                foundLayer = layer;
-                break;
-            } else if (selectedOrDefaultLayer === defaultStartLayerName || this.isStartLayer(layer)) {
+            if (
+                (selectedOrDefaultLayer === layer.name ||
+                    selectedOrDefaultLayer === `#${layer.name}` ||
+                    layer.name.endsWith("/" + selectedOrDefaultLayer)) &&
+                layer.type === "tilelayer" &&
+                (selectedOrDefaultLayer === defaultStartLayerName || this.isStartLayer(layer))
+            ) {
                foundLayer = layer;
                break;
            }