From 00b2c295f11533b491738e68e1eb2a9c517e65eb Mon Sep 17 00:00:00 2001
From: PacoRoberto9 <108595248+PacoRoberto9@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:50:13 -0500
Subject: [PATCH 1/4] Update setting.js

---
 packages/junon-io/server/commands/setting.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/junon-io/server/commands/setting.js b/packages/junon-io/server/commands/setting.js
index 0138c54..8a48aab 100644
--- a/packages/junon-io/server/commands/setting.js
+++ b/packages/junon-io/server/commands/setting.js
@@ -41,11 +41,11 @@ class Setting extends BaseCommand {
       return
     }
 
-    if (!this.sector.settings[key]) {
+    if (this.sector.settings[key] === undefined) {
       player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
       return
     }
-
+        
     if (["true", "false"].indexOf(value) === -1) {
       player.showChatError("invalid value. true/false accepted only")
       return
@@ -53,7 +53,7 @@ class Setting extends BaseCommand {
 
     if (value === 'true') value = true
     if (value === 'false') value = false
-
+    
     this.sector.editSetting(key, value)
     player.showChatSuccess(key + " set to " + value)
   }

From 928527f705832f923f7fd0041870ff0e7daa29bd Mon Sep 17 00:00:00 2001
From: PacoRoberto9 <108595248+PacoRoberto9@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:52:22 -0500
Subject: [PATCH 2/4] Update setting.js

---
 packages/junon-io/server/commands/setting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/junon-io/server/commands/setting.js b/packages/junon-io/server/commands/setting.js
index 8a48aab..e96fe20 100644
--- a/packages/junon-io/server/commands/setting.js
+++ b/packages/junon-io/server/commands/setting.js
@@ -41,7 +41,7 @@ class Setting extends BaseCommand {
       return
     }
 
-    if (this.sector.settings[key] === undefined) {
+    if (this.sector.settings[key] === undefined || this.sector.settings[key] === null) {
       player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
       return
     }

From b5b0b49e6382ae387bd9afaf41125d187cb70f03 Mon Sep 17 00:00:00 2001
From: PacoRoberto9 <108595248+PacoRoberto9@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:57:37 -0500
Subject: [PATCH 3/4] Update setting.js

---
 packages/junon-io/server/commands/setting.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/junon-io/server/commands/setting.js b/packages/junon-io/server/commands/setting.js
index e96fe20..8e5c200 100644
--- a/packages/junon-io/server/commands/setting.js
+++ b/packages/junon-io/server/commands/setting.js
@@ -41,11 +41,6 @@ class Setting extends BaseCommand {
       return
     }
 
-    if (this.sector.settings[key] === undefined || this.sector.settings[key] === null) {
-      player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
-      return
-    }
-        
     if (["true", "false"].indexOf(value) === -1) {
       player.showChatError("invalid value. true/false accepted only")
       return
@@ -54,6 +49,11 @@ class Setting extends BaseCommand {
     if (value === 'true') value = true
     if (value === 'false') value = false
     
+    if (!this.sector.settings[key]) {
+      player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
+      return
+    }
+        
     this.sector.editSetting(key, value)
     player.showChatSuccess(key + " set to " + value)
   }

From d028b25a20b247df455c02bc08a31516442db112 Mon Sep 17 00:00:00 2001
From: PacoRoberto9 <108595248+PacoRoberto9@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:01:17 -0500
Subject: [PATCH 4/4] Update setting.js

---
 packages/junon-io/server/commands/setting.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/junon-io/server/commands/setting.js b/packages/junon-io/server/commands/setting.js
index 8e5c200..8acbfb6 100644
--- a/packages/junon-io/server/commands/setting.js
+++ b/packages/junon-io/server/commands/setting.js
@@ -41,6 +41,7 @@ class Setting extends BaseCommand {
       return
     }
 
+    
     if (["true", "false"].indexOf(value) === -1) {
       player.showChatError("invalid value. true/false accepted only")
       return
@@ -48,12 +49,12 @@ class Setting extends BaseCommand {
 
     if (value === 'true') value = true
     if (value === 'false') value = false
-    
-    if (!this.sector.settings[key]) {
+
+   if (this.sector.settings[key] === undefined || this.sector.settings[key] === null) {
       player.showChatError("invalid key. Valid keys are: " + Object.keys(this.sector.settings).join(", "))
       return
     }
-        
+    
     this.sector.editSetting(key, value)
     player.showChatSuccess(key + " set to " + value)
   }