Index: binaries/data/mods/public/maps/random/ambush.js
===================================================================
--- binaries/data/mods/public/maps/random/ambush.js
+++ binaries/data/mods/public/maps/random/ambush.js
@@ -27,8 +27,7 @@
 				fractionToTiles(randFloat(0.2, 0.35)),
 				fractionToTiles(randFloat(0.08, 0.1)),
 				randomAngle(),
-				undefined),
-			g_PlayerbaseTypes[g_MapSettings.TeamPlacement].walls);
+				undefined));
 
 	markPlayerAvoidanceArea(playerPosition, defaultPlayerBaseRadius());
 }
Index: binaries/data/mods/public/maps/random/empire.js
===================================================================
--- binaries/data/mods/public/maps/random/empire.js
+++ binaries/data/mods/public/maps/random/empire.js
@@ -23,8 +23,7 @@
 		fractionToTiles(0.37),
 		fractionToTiles(0.04),
 		startAngle,
-		undefined),
-	false);
+		undefined));
 Engine.SetProgress(20);
 
 // Change the starting angle and add the players again
@@ -42,8 +41,7 @@
 		fractionToTiles(0.15),
 		fractionToTiles(0.04),
 		startAngle + rotation,
-		undefined),
-	false);
+		undefined));
 Engine.SetProgress(40);
 
 addElements(shuffleArray([
Index: binaries/data/mods/public/maps/random/frontier.js
===================================================================
--- binaries/data/mods/public/maps/random/frontier.js
+++ binaries/data/mods/public/maps/random/frontier.js
@@ -28,8 +28,7 @@
 			fractionToTiles(randFloat(0.2, 0.35)),
 			fractionToTiles(randFloat(0.08, 0.1)),
 			randomAngle(),
-			undefined),
-		g_PlayerbaseTypes[pattern].walls);
+			undefined));
 }
 Engine.SetProgress(40);
 
Index: binaries/data/mods/public/maps/random/harbor.js
===================================================================
--- binaries/data/mods/public/maps/random/harbor.js
+++ binaries/data/mods/public/maps/random/harbor.js
@@ -32,8 +32,7 @@
 			fractionToTiles(0.38),
 			fractionToTiles(0.05),
 			startAngle,
-			undefined),
-		true);
+			undefined));
 Engine.SetProgress(20);
 
 addCenterLake();
Index: binaries/data/mods/public/maps/random/hells_pass.js
===================================================================
--- binaries/data/mods/public/maps/random/hells_pass.js
+++ binaries/data/mods/public/maps/random/hells_pass.js
@@ -28,8 +28,7 @@
 		fractionToTiles(0.2),
 		fractionToTiles(0.08),
 		startAngle,
-		undefined),
-	false);
+		undefined));
 Engine.SetProgress(20);
 
 placeBarriers();
Index: binaries/data/mods/public/maps/random/lions_den.js
===================================================================
--- binaries/data/mods/public/maps/random/lions_den.js
+++ binaries/data/mods/public/maps/random/lions_den.js
@@ -31,8 +31,7 @@
 		fractionToTiles(0.4),
 		fractionToTiles(randFloat(0.05, 0.1)),
 		startAngle,
-		undefined),
-	true);
+		undefined));
 Engine.SetProgress(20);
 
 createSunkenTerrain();
Index: binaries/data/mods/public/maps/random/rmgen-common/player.js
===================================================================
--- binaries/data/mods/public/maps/random/rmgen-common/player.js
+++ binaries/data/mods/public/maps/random/rmgen-common/player.js
@@ -615,15 +615,15 @@
 	switch (patternName)
 	{
 		case "radial":
-			return playerPlacementCircle(distance, angle, center).slice(0, 2);
+			return playerPlacementCircle(distance, angle, center).slice(0, 2).concat(true);
 		case "river":
-			return playerPlacementRiver(angle, distance, center);
+			return playerPlacementRiver(angle, distance, center).concat(true);
 		case "line":
-			return placeLine(getTeamsArray(), distance, groupedDistance, angle);
+			return placeLine(getTeamsArray(), distance, groupedDistance, angle).concat(false);
 		case "stronghold":
-			return placeStronghold(getTeamsArray(), distance, groupedDistance, angle);
+			return placeStronghold(getTeamsArray(), distance, groupedDistance, angle).concat(false);
 		case "randomGroup":
-			return playerPlacementRandom(sortAllPlayers(), undefined);
+			return playerPlacementRandom(sortAllPlayers(), undefined).concat(true);
 		default:
 			throw new Error("Unknown placement pattern: " + patternName);
 	}
Index: binaries/data/mods/public/maps/random/rmgen2/setup.js
===================================================================
--- binaries/data/mods/public/maps/random/rmgen2/setup.js
+++ binaries/data/mods/public/maps/random/rmgen2/setup.js
@@ -54,33 +54,6 @@
 
 var g_TileClasses;
 
-var g_PlayerbaseTypes = {
-	"line": {
-		"getPosition": (distance, groupedDistance, startAngle) => placeLine(getTeamsArray(), distance, groupedDistance, startAngle),
-		"distance": fractionToTiles(randFloat(0.2, 0.35)),
-		"groupedDistance": fractionToTiles(randFloat(0.08, 0.1)),
-		"walls": false
-	},
-	"radial": {
-		"getPosition": (distance, groupedDistance, startAngle) => playerPlacementCircle(distance, startAngle),
-		"distance": fractionToTiles(randFloat(0.25, 0.35)),
-		"groupedDistance": fractionToTiles(randFloat(0.08, 0.1)),
-		"walls": true
-	},
-	"randomGroup": {
-		"getPosition": (distance, groupedDistance, startAngle) => playerPlacementRandom(sortAllPlayers()) || playerPlacementCircle(distance, startAngle),
-		"distance": fractionToTiles(randFloat(0.25, 0.35)),
-		"groupedDistance": fractionToTiles(randFloat(0.08, 0.1)),
-		"walls": true
-	},
-	"stronghold": {
-		"getPosition": (distance, groupedDistance, startAngle) => placeStronghold(getTeamsArray(), distance, groupedDistance, startAngle),
-		"distance": fractionToTiles(randFloat(0.2, 0.35)),
-		"groupedDistance": fractionToTiles(randFloat(0.08, 0.1)),
-		"walls": false
-	}
-};
-
 /**
  * Adds an array of elements to the map.
  */
Index: binaries/data/mods/public/maps/random/stronghold.js
===================================================================
--- binaries/data/mods/public/maps/random/stronghold.js
+++ binaries/data/mods/public/maps/random/stronghold.js
@@ -24,8 +24,7 @@
 			fractionToTiles(randFloat(0.2, 0.35)),
 			fractionToTiles(randFloat(0.05, 0.1)),
 			randomAngle(),
-			undefined),
-		false);
+			undefined));
 markPlayerAvoidanceArea(playerPosition, defaultPlayerBaseRadius());
 
 Engine.SetProgress(30);