Merge branch 'main' into fix/port-palworld

games/ark-survival-ascended-crossplay/game.yaml

@@ -3,7 +3,7 @@ id: ark-survival-ascended-crossplay
 name: 'ARK: Survival Ascended (Crossplay Dedicated Server)'
 defaultDockerImage: mschnitzer/asa-linux-server:latest
 containerUser: "25000:25000"
-defaultStartupCommand: bash -c 'mkdir -p /server /data/Steam /data/steamcmd /data/cluster-shared && rm -rf /home/gameserver/server-files /home/gameserver/Steam /home/gameserver/steamcmd /home/gameserver/cluster-shared && ln -sfn /server /home/gameserver/server-files && ln -sfn /data/Steam /home/gameserver/Steam && ln -sfn /data/steamcmd /home/gameserver/steamcmd && ln -sfn /data/cluster-shared /home/gameserver/cluster-shared && (cd /home/gameserver/steamcmd && { [ -x steamcmd.sh ] || wget -qO- https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz | tar xz; } && for i in 1 2 3; do ./steamcmd.sh +login anonymous +quit; ./steamcmd.sh +force_install_dir /home/gameserver/server-files +login anonymous +app_update 2430930 validate +quit; [ -f /home/gameserver/server-files/ShooterGame/Binaries/Win64/ArkAscendedServer.exe ] && break; echo "ARK install attempt $i failed, retrying in 15s"; sleep 15; done) && export ASA_START_PARAMS="${ASA_START_PARAMS:-${SERVER_MAP:-TheIsland_WP}?listen?Port=${PORT:-7777}?RCONPort=${RCONPORT:-27020}?RCONEnabled=True -WinLiveMaxPlayers=${MAX_PLAYERS:-70} -ServerPlatform=ALL}" && exec /usr/bin/start_server'
+defaultStartupCommand: bash -c 'mkdir -p /server /data/Steam /data/steamcmd /data/cluster-shared && rm -rf /home/gameserver/server-files /home/gameserver/Steam /home/gameserver/steamcmd /home/gameserver/cluster-shared && ln -sfn /server /home/gameserver/server-files && ln -sfn /data/Steam /home/gameserver/Steam && ln -sfn /data/steamcmd /home/gameserver/steamcmd && ln -sfn /data/cluster-shared /home/gameserver/cluster-shared && (cd /home/gameserver/steamcmd && { [ -x steamcmd.sh ] || wget -qO- https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz | tar xz; } && for i in 1 2 3; do ./steamcmd.sh +login anonymous +quit; ./steamcmd.sh +force_install_dir /home/gameserver/server-files +login anonymous +app_update 2430930 validate +quit; [ -f /home/gameserver/server-files/ShooterGame/Binaries/Win64/ArkAscendedServer.exe ] && break; echo "ARK install attempt $i failed, retrying in 15s"; sleep 15; done) && export ASA_START_PARAMS="${ASA_START_PARAMS:-${SERVER_MAP:-TheIsland_WP}?listen?Port=7777?RCONPort=${RCONPORT:-27020}?RCONEnabled=True -WinLiveMaxPlayers=${MAX_PLAYERS:-70} -ServerPlatform=ALL}" && exec /usr/bin/start_server'
 requiredMemoryMb: 16384
 requiredDiskMb: 32768
 defaultPorts:
@@ -25,7 +25,6 @@ defaultConfig:
   MaxPlayers: 70
   NightTimeSpeedScale: 1
   OverrideOfficialDifficulty: 5
-  Port: 7777
   PreventDiseases: false
   PreventDownloadDinos: false
   PreventDownloadItems: false
@@ -137,12 +136,6 @@ configSchema:
       description: Sets the maximum wild dino level ceiling (e.g. 5.0 allows wild creatures up to level 150).
       title: Override Official Difficulty
       type: number
-    Port:
-      category: System & General
-      default: 7777
-      description: Primary UDP port used by game clients to connect to the dedicated server.
-      title: Game Port
-      type: integer
     PreventDiseases:
       category: Gameplay & Rules
       default: false

games/minecraft-crossplay/game.yaml

@@ -40,7 +40,6 @@ defaultConfig:
   PVP: true
   RCON_PASSWORD: ""
   RCON_PORT: 25575
-  SERVER_PORT: 25565
   TYPE: PAPER
   USE_AIKAR_FLAGS: true
   VERSION: LATEST
@@ -181,12 +180,6 @@ configSchema:
       description: TCP port for remote console. Only reachable from the host node (not published publicly); GBR uses it for actions and player moderation.
       title: RCON Port
       type: integer
-    SERVER_PORT:
-      category: System & General
-      default: 25565
-      description: The TCP network port on which Java Edition Minecraft players connect.
-      title: Java Server Port
-      type: integer
     TYPE:
       category: System & General
       default: PAPER
@@ -362,7 +355,7 @@ agnosticCommandConfig:
   joinButtonLabel: How to Join
   joinModalTitle: How to Join This Server
   pingPort: 25565
-  pingPortKey: SERVER_PORT
+  pingPortKey: null
   playerJoinRegex: :\s+([a-zA-Z0-9_.*]+) joined the game
   playerLeaveRegex: :\s+([a-zA-Z0-9_.*]+) left the game
   playersCommand: null