From b2a6dc80b4f9b1f1b2886748288cf9b663eed182 Mon Sep 17 00:00:00 2001
From: softwarenoob <admin@softwarenoob.com>
Date: Wed, 24 Nov 2021 09:49:48 +0200
Subject: [PATCH] fix: Xonotic egg

Updates Docker images to use yolks

Delete config parser that was leftover from tshock egg
Fixes glibc missing
Fixes missing server config file and does not overwrite it on reinstall
Fixes server shutdown

resolves #1410
---
 game_eggs/xonotic/xonotic/egg-xonotic.json | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/game_eggs/xonotic/xonotic/egg-xonotic.json b/game_eggs/xonotic/xonotic/egg-xonotic.json
index 4fa357c9..4817c6a8 100644
--- a/game_eggs/xonotic/xonotic/egg-xonotic.json
+++ b/game_eggs/xonotic/xonotic/egg-xonotic.json
@@ -1,24 +1,29 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2018-02-23T15:46:08-05:00",
+    "exported_at": "2021-11-24T07:45:11+00:00",
     "name": "Xonotic",
     "author": "parker@parkervcp.com",
     "description": "This is for the default xonotic setup.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": null,
+    "images": [
+        "ghcr.io\/pterodactyl\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/xonotic-linux64-dedicated +log_file latest.log +net_address 0.0.0.0 +port {{SERVER_PORT}} +maxplayers {{MAX_PLAYERS}}",
     "config": {
-        "files": "{\r\n    \"tshock\/config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {}\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Server listening on address 0.0.0.0:\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Server listening on address 0.0.0.0:\"\r\n}",
+        "logs": "{}",
+        "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip",
-            "container": "alpine:3.9",
+            "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\n# create initial folder structure to copy the default config to, because it only gets created on first startup\r\nmkdir -p .xonotic\/data\r\ncp-n server\/server.cfg .xonotic\/data\/server.cfg || true # do not overwrite existing config file\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip",
+            "container": "ghcr.io\/pterodactyl\/installers:alpine",
             "entrypoint": "ash"
         }
     },
@@ -28,9 +33,9 @@
             "description": "Max players allowed on the server",
             "env_variable": "MAX_PLAYERS",
             "default_value": "16",
-            "user_viewable": 1,
-            "user_editable": 0,
-            "rules": "required|numeric|digits_between:1,3"
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric|digits_between:1,2"
         }
     ]
 }