0.0.79 Release

chrisk123999 · Mar 15, 2023 · a874d03 · a874d03
1 parent e852589
commit a874d03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/scripts/module.js b/scripts/module.js
@@ -36,13 +36,13 @@ Hooks.once('ready', async function() {
 	}
 	if (game.settings.get('chris-premades', 'Armor of Agathys')) Hooks.on('midi-qol.RollComplete', macros.armorOfAgathys);
 	if (game.settings.get('chris-premades', 'Beacon of Hope')) Hooks.on('midi-qol.damageApplied', macros.beaconOfHope);
-	if (game.settings.get('chris-premades', 'Combat Listener') || game.user.isGM) Hooks.on('updateCombat', combatUpdate);
+	if (game.settings.get('chris-premades', 'Combat Listener') && game.user.isGM) Hooks.on('updateCombat', combatUpdate);
 	if (game.settings.get('chris-premades', 'DMG Cleave')) Hooks.on('midi-qol.RollComplete', macros.cleave);
 	if (game.settings.get('chris-premades', 'Darkness')) Hooks.on('midi-qol.preAttackRoll', macros.darkness.hook);
 	if (game.settings.get('chris-premades', 'Death Ward')) Hooks.on('midi-qol.damageApplied', macros.deathWard);
 	if (game.settings.get('chris-premades', 'Defensive Field')) Hooks.on('dnd5e.restCompleted', macros.armorModel.longRest);
 	if (game.settings.get('chris-premades', 'Mirror Image')) Hooks.on('midi-qol.AttackRollComplete', macros.mirrorImage);
-	if (game.settings.get('chris-premades', 'Movement Listener') || game.user.isGM) Hooks.on('updateToken', tokenMoved);
+	if (game.settings.get('chris-premades', 'Movement Listener') && game.user.isGM) Hooks.on('updateToken', tokenMoved);
 	if (game.settings.get('chris-premades', 'On Hit')) Hooks.on('midi-qol.RollComplete', onHitMacro);
 	if (game.settings.get('chris-premades', 'Protection from Evil and Good')) Hooks.on('midi-qol.preAttackRoll', macros.protectionFromEvilAndGood);
 	if (game.settings.get('chris-premades', 'Sanctuary')) Hooks.on('midi-qol.preItemRoll', macros.sanctuary);

diff --git a/scripts/movement.js b/scripts/movement.js
@@ -40,7 +40,7 @@ export function combatUpdate(combat, changes, context) {
     if (!changes.turn && !changes.round) return;
     if (!combat.started || !combat.isActive) return;
     if (currentRound < previousRound || (currentTurn < previousTurn && currentTurn === previousRound)) return;
-    let token = canvas.tokens.get(combat.current.tokenId);
+    let token = game.combat.scene.tokens.get(combat.current.tokenId);
     if (!token) return;
     for (let name of Object.values(triggers)) {
         let validSources = [];
@@ -49,15 +49,15 @@ export function combatUpdate(combat, changes, context) {
             let sourceToken = canvas.tokens.get(spell.sourceTokenID);
             if (!sourceToken) continue;
             if (spell.ignoreSelf && sourceToken.id == token.id) continue;
-            if (spell.nonAllies && (token.document.disposition === sourceToken.document.disposition || token.document.disposition === 0)) continue;
+            if (spell.nonAllies && (token.disposition === sourceToken.disposition || token.disposition === 0)) continue;
             let distance = chris.getDistance(token, sourceToken);
             if (distance > spell.range) continue;
             validSources.push(spell);
         }
         let maxLevel = Math.max(...validSources.map(spell => spell.castLevel));
         let selectedSpell = validSources.find(spell => spell.castLevel === maxLevel);
         if (!selectedSpell) return;
-        macros.onMove(selectedSpell.macro, token.document, selectedSpell.castLevel, selectedSpell.spellDC, selectedSpell.damage, selectedSpell.damageType, selectedSpell.sourceTokenID);
+        macros.onMove(selectedSpell.macro, token, selectedSpell.castLevel, selectedSpell.spellDC, selectedSpell.damage, selectedSpell.damageType, selectedSpell.sourceTokenID);
     }
 }
 async function addTrigger(name, castLevel, spellDC, damage, damageType, sourceTokenID, range, ignoreSelf, nonAllies, turn) {

diff --git a/scripts/settings.js b/scripts/settings.js
@@ -26,7 +26,7 @@ export function registerSettings() {
 		'type': Boolean,
 		'default': false,
 		'onChange': value => {
-			if (value || game.user.isGM) {
+			if (value && game.user.isGM) {
 				Hooks.on('updateToken', tokenMoved);
 			} else if (game.user.isGM) {
 				Hooks.off('updateToken', tokenMoved);
@@ -48,7 +48,7 @@ export function registerSettings() {
 		'type': Boolean,
 		'default': false,
 		'onChange': value => {
-			if (value || game.user.isGM) {
+			if (value && game.user.isGM) {
 				Hooks.on('updateCombat', combatUpdate);
 			} else if (game.user.isGM) {
 				Hooks.off('updateCombat', combatUpdate);