From 3af55041971ebe9b7fba66cd6710d12cc5c2cf47 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Wed, 20 May 2020 14:20:04 +0200
Subject: [PATCH] Delete erroneous 'this' specificators prepended to Job values
VSCode completion inserts them sometimes (don't know what triggers
that), but inside the SugarCube 'this' is different, apparently.
Fixes #1811.
---
src/js/assignJS.js | 6 +++---
src/js/removeActiveSlave.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index cfad1dae9d0..4a3e0f9453e 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -13,12 +13,12 @@ globalThis.assignJob = function(slave, job) {
// handle non-exclusive pseudo-assignments as special cases
if (job === Job.PIT) {
V.fighterIDs.push(slave.ID);
- V.JobIDMap[this.Job.PIT].add(slave.ID);
+ V.JobIDMap[Job.PIT].add(slave.ID);
return r;
} else if (job === Job.LURCHER) {
V.LurcherID = slave.ID;
- V.JobIDMap[this.Job.LURCHER].clear();
- V.JobIDMap[this.Job.LURCHER].add(slave.ID);
+ V.JobIDMap[Job.LURCHER].clear();
+ V.JobIDMap[Job.LURCHER].add(slave.ID);
return r;
}
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 6cecd81599a..1f216d784f9 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -276,7 +276,7 @@ globalThis.removeNonNGPSlave = function(removedSlave) {
if (INDEX >= 0 && INDEX < LENGTH) {
V.slaves.forEach(slave => {
- if (slave.assignment === this.Job.IMPORTED) {
+ if (slave.assignment === Job.IMPORTED) {
WombChangeID(slave, ID, V.missingParentID); /* This check is complex, should be done in JS now, all needed will be done here. */
WombChangeGeneID(slave, ID, V.missingParentID);
if (slave.pregSource === V.missingParentID) {
--
GitLab