From 0cf1697594511f8377a7e69522dbf67a12d22b28 Mon Sep 17 00:00:00 2001 From: phosit Date: Thu, 31 Jul 2025 19:19:50 +0200 Subject: [PATCH] Allow maps to not specify BaseResourceClass There was already a check to handle no `BaseResourceClass` but it's handled in a way that could lead to errors later on. --- .../mods/public/maps/random/rmgen-common/player.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/binaries/data/mods/public/maps/random/rmgen-common/player.js b/binaries/data/mods/public/maps/random/rmgen-common/player.js index e83e203c03..39b7abd666 100644 --- a/binaries/data/mods/public/maps/random/rmgen-common/player.js +++ b/binaries/data/mods/public/maps/random/rmgen-common/player.js @@ -203,12 +203,10 @@ function addCivicCenterAreaToClass(position, tileClass) */ function getPlayerBaseConstraint(playerBaseArgs) { - let baseResourceConstraint = playerBaseArgs.BaseResourceClass && avoidClasses(playerBaseArgs.BaseResourceClass, 4); - - if (playerBaseArgs.baseResourceConstraint) - baseResourceConstraint = new AndConstraint([baseResourceConstraint, playerBaseArgs.baseResourceConstraint]); - - return baseResourceConstraint; + return new AndConstraint([ + playerBaseArgs.BaseResourceClass ? avoidClasses(playerBaseArgs.BaseResourceClass, 4) : [], + playerBaseArgs.baseResourceConstraint || [] + ].flat()); } function placePlayerBaseCityPatch(args)