From 21dc1dde387e3d06fe3e7f7337b24a3f1e9058b8 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@mailbox.org>
Date: Sun, 4 Dec 2022 00:23:42 +0100
Subject: [PATCH] Fix slaves not removed from trainee list when selling
---
src/data/backwardsCompatibility/pitBC.js | 6 +++++-
src/js/removeSlave.js | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/data/backwardsCompatibility/pitBC.js b/src/data/backwardsCompatibility/pitBC.js
index eeb2d3437cc..ceb8677d4bf 100644
--- a/src/data/backwardsCompatibility/pitBC.js
+++ b/src/data/backwardsCompatibility/pitBC.js
@@ -36,6 +36,10 @@ App.Facilities.Pit.BC = function() {
}
if (V.slaveFightingBG && V.pit) {
- V.pit.slaveFightingBodyguard = V.slaveFightingBG;
+ V.pit.slaveFightingBodyguard = V.slaveFightingBG;
+ }
+
+ if (V.pit && V.pit.trainingIDs) {
+ V.pit.trainingIDs = V.pit.trainingIDs.filter(id => !!getSlave(id));
}
};
diff --git a/src/js/removeSlave.js b/src/js/removeSlave.js
index e6e479acc53..6cdb3c72a91 100644
--- a/src/js/removeSlave.js
+++ b/src/js/removeSlave.js
@@ -116,6 +116,10 @@ globalThis.removeSlave = function(slave) {
}
});
+ /* remove from Pit trainee list, if needed */
+ if (V.pit && V.pit.trainingIDs) {
+ V.pit.trainingIDs.delete(AS_ID);
+ }
/* remove from Pit fighters list, if needed */
if (V.pit && V.pit.fighterIDs) {
V.pit.fighterIDs.delete(AS_ID);
--
GitLab