closes #470

Muttley · Jun 20, 2024 · b5936fd · b5936fd
1 parent 58dbb35
commit b5936fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v11.12.1
+
+#### Bugs
+- [#470] Scavenging gets stuck in a loop if no valid items to draw
+
+---
+
 # v11.12.0
 
 #### Enhancements

diff --git a/system/src/sheets/FalloutScavengingLocationSheet.mjs b/system/src/sheets/FalloutScavengingLocationSheet.mjs
@@ -129,11 +129,8 @@ export default class FalloutScavengingLocationSheet extends FalloutBaseActorShee
 
 		const items = [];
 
-		const avoidDuplicates = false;
-
 		if (table) {
-			let itemsToDraw = count;
-			while (itemsToDraw > 0) {
+			for (let i = 0; i < count; i++) {
 				const draw = await table.draw({displayChat: false});
 				const result = draw.results.find(r => r.type === "pack");
 
@@ -146,12 +143,8 @@ export default class FalloutScavengingLocationSheet extends FalloutBaseActorShee
 					result.documentId,
 				].join(".");
 
-				if (avoidDuplicates && this.drawItemsLut[itemUuid]) continue;
-
 				this.drawItemsLut[itemUuid] = true;
 
-				itemsToDraw--;
-
 				const item = await fromUuid(itemUuid);
 
 				if (item) {

diff --git a/system/system.json b/system/system.json
@@ -2,7 +2,7 @@
 	"id": "fallout",
 	"title": "Fallout: The Roleplaying Game",
 	"description": "An unofficial system for playing the Fallout RPG from Modiphius Entertainment Ltd.",
-	"version": "11.12.0",
+	"version": "11.12.1",
 	"compatibility": {
 		"minimum": "11",
 		"verified": "12"