fix: bugfixes from #485

dirigeants · Nov 11, 2018 · c6593ee · c6593ee
1 parent 5f3aef6
commit c6593ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git 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
@@ -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);
+					}
 				}
 			`);
 		}