From 74f00b306116d1487b9e41737e3ca7271d296e91 Mon Sep 17 00:00:00 2001 From: Lupestro Date: Sun, 6 Jun 2021 10:51:10 -0400 Subject: [PATCH] Bug fixes affecting non-GM 0.8.6 players --- torch.js | 7 ++++--- torch.zip | Bin 7930 -> 8289 bytes 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/torch.js b/torch.js index 2fecfa7..2fd9e97 100644 --- a/torch.js +++ b/torch.js @@ -95,7 +95,8 @@ class Torch { if (torches === null) { var itemToCheck = game.settings.get("torch", "gmInventoryItemName"); if (item.name.toLowerCase() === itemToCheck.toLowerCase()) { - if (item.data.quantity > 0) { + let quantity = typeof item.data.quantity !== "undefined" ? item.data.quantity : item.data.data.quantity; + if (quantity > 0) { torches = itemToCheck; return; } @@ -162,8 +163,8 @@ class Torch { // Don't let Dancing Lights have/use torches. :D if (data.name === 'Dancing Light' && - data.dimLight === 20 && - data.brightLight === 10) { + data.dimLight === 10 && + data.brightLight === 0) { return; } diff --git a/torch.zip b/torch.zip index b58f46e1a0bddd6e7b2db44e9d907da49777e9a0..77642a4e75400cccc3f20e78a53707f164c5bde9 100644 GIT binary patch delta 4365 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 delta 4023 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