From e8ef4ff795a45159fca7ec892229f4e4a7bff6c9 Mon Sep 17 00:00:00 2001
From: Faith <tba28012@hotmail.com>
Date: Sun, 11 Nov 2018 03:00:24 -0500
Subject: [PATCH] fix: bugfixes from #485

---
 src/events/coreSettingsDelete.js | 13 +++++++------
 src/events/coreSettingsUpdate.js | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/events/coreSettingsDelete.js b/src/events/coreSettingsDelete.js
index 8396aa7178..4a51d8ea60 100644
--- a/src/events/coreSettingsDelete.js
+++ b/src/events/coreSettingsDelete.js
@@ -10,12 +10,13 @@ module.exports = class extends Event {
 	run(settings) {
 		if (gateways.includes(settings.gateway.name)) {
 			this.client.shard.broadcastEval(`
-				if (String(this.shard.id) === '${this.client.shard.id}') return;
-				const entry = this.gateways.get('${settings.gateway.name}').get('${settings.id}');
-				if (entry && entry.existenceStatus) {
-					this.emit('settingsDelete', settings);
-					entry.init(entry, entry.schema);
-					entry.existenceStatus = false;
+				if (String(this.shard.id) !== '${this.client.shard.id}') {
+					const entry = this.gateways.get('${settings.gateway.name}').get('${settings.id}');
+					if (entry && entry.existenceStatus) {
+						this.emit('settingsDelete', settings);
+						entry.init(entry, entry.schema);
+						entry.existenceStatus = false;
+					}
 				}
 			`);
 		}
diff --git a/src/events/coreSettingsUpdate.js b/src/events/coreSettingsUpdate.js
index 1fb106bf19..8d7bfc1674 100644
--- a/src/events/coreSettingsUpdate.js
+++ b/src/events/coreSettingsUpdate.js
@@ -10,12 +10,13 @@ module.exports = class extends Event {
 	run(settings) {
 		if (gateways.includes(settings.gateway.name)) {
 			this.client.shard.broadcastEval(`
-				if (String(this.shard.id) === '${this.client.shard.id}') return;
-				const entry = this.gateways.get('${settings.gateway.name}').get('${settings.id}');
-				if (entry) {
-					entry._patch(${JSON.stringify(settings)});
-					entry.existenceStatus = true;
-					this.emit('settingsSync', settings);
+				if (String(this.shard.id) !== '${this.client.shard.id}') {
+					const entry = this.gateways.get('${settings.gateway.name}').get('${settings.id}');
+					if (entry) {
+						entry._patch(${JSON.stringify(settings)});
+						entry.existenceStatus = true;
+						this.emit('settingsSync', settings);
+					}
 				}
 			`);
 		}