From 08b74957a85b5d9b56459b8695e3fcc46cca5458 Mon Sep 17 00:00:00 2001
From: Robert Paciorek <robert@opcode.eu.org>
Date: Wed, 27 Mar 2024 12:28:51 +0000
Subject: [PATCH] use MMOServer in appsettings.json for config

and improved run.sh
---
 run.sh                    |  3 +++
 src/Core/Configuration.cs |  2 +-
 src/appsettings.json      | 36 ++++++++++++++++++------------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/run.sh b/run.sh
index 710f74e..835f5b9 100755
--- a/run.sh
+++ b/run.sh
@@ -1 +1,4 @@
+#!/bin/sh
+
+cd "$(dirname "$0")"
 dotnet run --project src/sodoffmmo.csproj
diff --git a/src/Core/Configuration.cs b/src/Core/Configuration.cs
index c43f245..bd44ca3 100644
--- a/src/Core/Configuration.cs
+++ b/src/Core/Configuration.cs
@@ -15,7 +15,7 @@ internal static class Configuration {
             .AddJsonFile("appsettings.json", true)
             .Build();
 
-        ServerConfiguration? serverConfiguration = config.GetSection("ServerConfiguration").Get<ServerConfiguration>();
+        ServerConfiguration? serverConfiguration = config.GetSection("MMOServer").Get<ServerConfiguration>();
         if (serverConfiguration is null)
             return;
 
diff --git a/src/appsettings.json b/src/appsettings.json
index df5e2fe..ca46722 100644
--- a/src/appsettings.json
+++ b/src/appsettings.json
@@ -1,27 +1,27 @@
 {
-    "ServerConfiguration": {
-        "// ListenIP": "Listening IP address for the asset server, default is '*' which represents all IPv4 and IPv6 addresses",
-        "ListenIP": "*",
+  "MMOServer": {
+    "// ListenIP": "Listening IP address for the asset server, default is '*' which represents all IPv4 and IPv6 addresses",
+    "ListenIP": "*",
 
-        "// Port": "Listening port number for the MMO server",
-        "Port": 9933,
+    "// Port": "Listening port number for the MMO server",
+    "Port": 9933,
 
-        "// EnableChat": "When true, in-game chat will be enabled",
-        "EnableChat": true,
+    "// EnableChat": "When true, in-game chat will be enabled",
+    "EnableChat": true,
 
-        "// FirstEventTimer": "time to start of first world event (battle ship event) after start MMO server",
-        "FirstEventTimer": 3,
+    "// FirstEventTimer": "time to start of first world event (battle ship event) after start MMO server",
+    "FirstEventTimer": 3,
 
-        "// EventTimer": "time between start of world events (battle ship events)",
-        "EventTimer": 30,
+    "// EventTimer": "time between start of world events (battle ship events)",
+    "EventTimer": 30,
 
-        "// RacingMaxPlayers": "maximum players allowed in Thunder Run Racing (no more than 6)",
-        "RacingMaxPlayers": 6,
+    "// RacingMaxPlayers": "maximum players allowed in Thunder Run Racing (no more than 6)",
+    "RacingMaxPlayers": 6,
 
-        "// RacingMinPlayers": "minimum players to start Thunder Run Racing",
-        "RacingMinPlayers": 2,
+    "// RacingMinPlayers": "minimum players to start Thunder Run Racing",
+    "RacingMinPlayers": 2,
 
-        "// AllowChaos": "disable server side exploit protection",
-        "AllowChaos": false
-    }
+    "// AllowChaos": "disable server side exploit protection",
+    "AllowChaos": false
+  }
 }