From 9522b6d941d46634be564bce958de7cd275b3cd1 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 18 Jan 2025 14:22:20 -0700 Subject: [PATCH] Fix setting/going/deleting home without name argument --- AriasServerUtils/ASUModSystem.cs | 6 +++--- AriasServerUtils/EventHandler.cs | 6 +++--- AriasServerUtils/assets/ariasserverutils/lang/en.json | 3 ++- AriasServerUtils/modinfo.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/AriasServerUtils/ASUModSystem.cs b/AriasServerUtils/ASUModSystem.cs index 49dc245..1be9cf4 100644 --- a/AriasServerUtils/ASUModSystem.cs +++ b/AriasServerUtils/ASUModSystem.cs @@ -192,7 +192,7 @@ namespace AriasServerUtils public void SaveGlobalConfig() { - API.StoreModConfig(config, GetConfigurationFile("", ModConfigType.Global)); + API.StoreModConfig(config, GetConfigurationFile("global", ModConfigType.Global)); } private void OnGameReady() @@ -200,7 +200,7 @@ namespace AriasServerUtils // Mod Setup Info // // -> Step 1. Load Mod Global Config <- - config = API.LoadModConfig(GetConfigurationFile("", ModConfigType.Global)); + config = API.LoadModConfig(GetConfigurationFile("global", ModConfigType.Global)); if (config == null) config = new ASUModConfig(); } @@ -208,7 +208,7 @@ namespace AriasServerUtils { if (type == ModConfigType.Global) { - return "ariaserverconfig/global.json"; + return $"ariaserverconfig/{sName}.json"; } else if (type == ModConfigType.World) { diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index cdb02f6..987f3da 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -20,7 +20,7 @@ namespace AriasServerUtils string homeName = "default"; if (args.ArgCount > 0) { - homeName = args[0] as string; + homeName = args[0] as string ?? "default"; } if (args.Caller.Player is IServerPlayer isp) @@ -47,7 +47,7 @@ namespace AriasServerUtils string homeName = "default"; if (args.ArgCount > 0) { - homeName = args[0] as string; + homeName = args[0] as string ?? "default"; } if (args.Caller.Player is IServerPlayer isp) @@ -96,7 +96,7 @@ namespace AriasServerUtils string homeName = "default"; if (args.ArgCount > 0) { - homeName = args[0] as string; + homeName = args[0] as string ?? "default"; } if (args.Caller.Player is IServerPlayer isp) diff --git a/AriasServerUtils/assets/ariasserverutils/lang/en.json b/AriasServerUtils/assets/ariasserverutils/lang/en.json index a8c6a12..b78a299 100644 --- a/AriasServerUtils/assets/ariasserverutils/lang/en.json +++ b/AriasServerUtils/assets/ariasserverutils/lang/en.json @@ -14,5 +14,6 @@ "home-tp": "You have teleported home", "home-no": "No such home exists", "home-max": "You have reached your max number of homes", - "home-set": "Home saved" + "home-set": "Home saved", + "home-del": "Home deleted" } diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 2054eec..0559972 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 01-18-2025 @ 02:06 PM", - "version": "1.0.0-dev.5", + "description": "A collection of server utilities\n\nBuild Date: 01-18-2025 @ 02:17 PM", + "version": "1.0.0-dev.6", "dependencies": { "game": "" }