From a2f488e5e3f6805a30cd0cf5e5649630c9441f7f Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sun, 26 Nov 2023 20:50:08 +1100
Subject: [PATCH] move ProxyPort config out of DevMode

---
 config.json                        |  2 +-
 config/config.go                   | 32 +++++++++++++++---------------
 main.go                            |  2 +-
 server/entranceserver/make_resp.go |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config.json b/config.json
index bfa9e04de..d6c233470 100644
--- a/config.json
+++ b/config.json
@@ -13,6 +13,7 @@
   "DeleteOnSaveCorruption": false,
   "ClientMode": "ZZ",
   "QuestCacheExpiry": 300,
+  "ProxyPort": 0,
   "DevMode": true,
   "DevModeOptions": {
     "AutoCreateAccount": true,
@@ -29,7 +30,6 @@
     "MezFesAlt": false,
     "DisableTokenCheck": false,
     "QuestDebugTools": false,
-    "ProxyPort": 0,
     "EarthStatusOverride": 0,
     "EarthIDOverride": 0,
     "EarthMonsterOverride": 0,
diff --git a/config/config.go b/config/config.go
index c9a05d3d1..5bcea5659 100644
--- a/config/config.go
+++ b/config/config.go
@@ -79,7 +79,8 @@ type Config struct {
 	DeleteOnSaveCorruption bool     // Attempts to save corrupted data will flag the save for deletion
 	ClientMode             string
 	RealClientMode         Mode
-	QuestCacheExpiry       int // Number of seconds to keep quest data cached
+	QuestCacheExpiry       int    // Number of seconds to keep quest data cached
+	ProxyPort              uint16 // Forces the game to connect to a channel server proxy
 	DevMode                bool
 
 	DevModeOptions  DevModeOptions
@@ -96,21 +97,20 @@ type Config struct {
 
 // DevModeOptions holds various debug/temporary options for use while developing Erupe.
 type DevModeOptions struct {
-	AutoCreateAccount    bool   // Automatically create accounts if they don't exist
-	CleanDB              bool   // Automatically wipes the DB on server reset.
-	MaxLauncherHR        bool   // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
-	LogInboundMessages   bool   // Log all messages sent to the server
-	LogOutboundMessages  bool   // Log all messages sent to the clients
-	LogMessageData       bool   // Log all bytes transferred as a hexdump
-	MaxHexdumpLength     int    // Maximum number of bytes printed when logs are enabled
-	DivaEvent            int    // Diva Defense event status
-	FestaEvent           int    // Hunter's Festa event status
-	TournamentEvent      int    // VS Tournament event status
-	MezFesEvent          bool   // MezFes status
-	MezFesAlt            bool   // Swaps out Volpakkun for Tokotoko
-	DisableTokenCheck    bool   // Disables checking login token exists in the DB (security risk!)
-	QuestDebugTools      bool   // Enable various quest debug logs
-	ProxyPort            uint16 // Forces the game connect to a channel server proxy
+	AutoCreateAccount    bool // Automatically create accounts if they don't exist
+	CleanDB              bool // Automatically wipes the DB on server reset.
+	MaxLauncherHR        bool // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
+	LogInboundMessages   bool // Log all messages sent to the server
+	LogOutboundMessages  bool // Log all messages sent to the clients
+	LogMessageData       bool // Log all bytes transferred as a hexdump
+	MaxHexdumpLength     int  // Maximum number of bytes printed when logs are enabled
+	DivaEvent            int  // Diva Defense event status
+	FestaEvent           int  // Hunter's Festa event status
+	TournamentEvent      int  // VS Tournament event status
+	MezFesEvent          bool // MezFes status
+	MezFesAlt            bool // Swaps out Volpakkun for Tokotoko
+	DisableTokenCheck    bool // Disables checking login token exists in the DB (security risk!)
+	QuestDebugTools      bool // Enable various quest debug logs
 	EarthStatusOverride  int32
 	EarthIDOverride      int32
 	EarthMonsterOverride int32
diff --git a/main.go b/main.go
index 724fe3f44..1413392cf 100644
--- a/main.go
+++ b/main.go
@@ -26,7 +26,7 @@ func cleanDB(db *sqlx.DB, config *_config.Config) {
 	_ = db.MustExec("DELETE FROM guild_characters")
 	_ = db.MustExec("DELETE FROM guilds")
 	_ = db.MustExec("DELETE FROM characters")
-	if !config.DevMode || config.DevModeOptions.ProxyPort == 0 {
+	if config.ProxyPort == 0 {
 		_ = db.MustExec("DELETE FROM sign_sessions")
 	}
 	_ = db.MustExec("DELETE FROM users")
diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go
index 5ace5a427..4b478fa24 100644
--- a/server/entranceserver/make_resp.go
+++ b/server/entranceserver/make_resp.go
@@ -69,8 +69,8 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
 
 		for channelIdx, ci := range si.Channels {
 			sid = (4096 + serverIdx*256) + (16 + channelIdx)
-			if _config.ErupeConfig.DevMode && _config.ErupeConfig.DevModeOptions.ProxyPort != 0 {
-				bf.WriteUint16(_config.ErupeConfig.DevModeOptions.ProxyPort)
+			if _config.ErupeConfig.DevMode && _config.ErupeConfig.ProxyPort != 0 {
+				bf.WriteUint16(_config.ErupeConfig.ProxyPort)
 			} else {
 				bf.WriteUint16(ci.Port)
 			}