v2.6.9

jaltepeter · Jun 9, 2020 · b3f5a06 · b3f5a06
1 parent 5bba9d1
commit b3f5a06
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.6.9
+- Fix console error when moving token outside of combat
+
 # 2.6.8
 - Test compatibility with Foundry v0.6.2
 - Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn

diff --git a/dist/module.json b/dist/module.json
@@ -3,7 +3,7 @@
 	"title": "Turn Marker",
 	"description": "Displays a (optionally animated) marker on the token who's active turn it is.",
 	"author": "Brunhine",
-	"version": "2.6.8",
+	"version": "2.6.9",
 	"minimumCoreVersion": "0.5.6",
 	"compatibleCoreVersion": "0.6.2",
 	"esmodules": [
@@ -35,5 +35,5 @@
 	],
 	"url": "https://github.com/Brunhine/TurnMarker",
 	"manifest": "https://raw.githubusercontent.com/Brunhine/TurnMarker/master/src/module.json",
-	"download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.8/turnmarker.zip"
+	"download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.9/turnmarker.zip"
 }
diff --git a/dist/scripts/turnmarker.js b/dist/scripts/turnmarker.js
diff --git a/dist/scripts/turnmarker.js.map b/dist/scripts/turnmarker.js.map
diff --git a/dist/templates/updateWindow.html b/dist/templates/updateWindow.html
@@ -21,15 +21,19 @@ <h2>Want to support development?</h2>
         href="https://github.com/brunhine/turnmarker#support-development">check here</a> for more info.</h2>
 
 <h1>Important Changes</h1>
-<p>Below are just of the changes to the module that should be called out. The full changelog is also available
+<p>Below are just some of the changes to the module that should be called out. The full changelog is also available
     <a href="https://github.com/Brunhine/TurnMarker/blob/master/CHANGELOG.md">here</a>.</p>
+<h2>v2.6.9</h2>
+<ul>
+    <li>Fixed a console error when moving a token outside of combat</li>
+</ul>
+<p style="display: flex; flex-flow: row nowrap; align-items: center; justify-content: flex-start;"><input
+        type="checkbox" class='show-again' id="welcome-screen-show-again" /> <label
+        for="welcome-screen-show-again">Don't show this screen again until next update.</label></p>
 <h2>v2.6.8</h2>
 <ul>
     <li>Test compatibility with Foundry v0.6.2</li>
     <li>Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn
     </li>
     <li>Video files (webm, ogg, & mp4) should now properly display in the marker previewer in settings</li>
-</ul>
-<p style="display: flex; flex-flow: row nowrap; align-items: center; justify-content: flex-start;"><input
-        type="checkbox" class='show-again' id="welcome-screen-show-again" /> <label
-        for="welcome-screen-show-again">Don't show this screen again until next update.</label></p>
+</ul>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "turnmarker",
-	"version": "2.6.8",
+	"version": "2.6.9",
 	"description": "",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"

diff --git a/src/module.json b/src/module.json
@@ -3,7 +3,7 @@
 	"title": "Turn Marker",
 	"description": "Displays a (optionally animated) marker on the token who's active turn it is.",
 	"author": "Brunhine",
-	"version": "2.6.8",
+	"version": "2.6.9",
 	"minimumCoreVersion": "0.5.6",
 	"compatibleCoreVersion": "0.6.2",
 	"esmodules": [
@@ -35,5 +35,5 @@
 	],
 	"url": "https://github.com/Brunhine/TurnMarker",
 	"manifest": "https://raw.githubusercontent.com/Brunhine/TurnMarker/master/src/module.json",
-	"download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.8/turnmarker.zip"
+	"download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.9/turnmarker.zip"
 }
diff --git a/src/scripts/turnmarker.js b/src/scripts/turnmarker.js
@@ -52,8 +52,10 @@ Hooks.on('createTile', (scene, tile) => {
 });
 
 Hooks.on('preUpdateToken', async (scene, token) => {
-    if (token._id == game.combat.combatant.token._id && !canvas.scene.getFlag(FlagScope, Flags.startMarkerPlaced)) {
-        await Marker.placeStartMarker(game.combat.combatant.token._id);
+    if (game.combat) {
+        if (token._id == game.combat.combatant.token._id && !canvas.scene.getFlag(FlagScope, Flags.startMarkerPlaced)) {
+            await Marker.placeStartMarker(game.combat.combatant.token._id);
+        }
     }
 });
 

diff --git a/src/templates/updateWindow.html b/src/templates/updateWindow.html
@@ -21,15 +21,19 @@ <h2>Want to support development?</h2>
         href="https://github.com/brunhine/turnmarker#support-development">check here</a> for more info.</h2>
 
 <h1>Important Changes</h1>
-<p>Below are just of the changes to the module that should be called out. The full changelog is also available
+<p>Below are just some of the changes to the module that should be called out. The full changelog is also available
     <a href="https://github.com/Brunhine/TurnMarker/blob/master/CHANGELOG.md">here</a>.</p>
+<h2>v2.6.9</h2>
+<ul>
+    <li>Fixed a console error when moving a token outside of combat</li>
+</ul>
+<p style="display: flex; flex-flow: row nowrap; align-items: center; justify-content: flex-start;"><input
+        type="checkbox" class='show-again' id="welcome-screen-show-again" /> <label
+        for="welcome-screen-show-again">Don't show this screen again until next update.</label></p>
 <h2>v2.6.8</h2>
 <ul>
     <li>Test compatibility with Foundry v0.6.2</li>
     <li>Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn
     </li>
     <li>Video files (webm, ogg, & mp4) should now properly display in the marker previewer in settings</li>
-</ul>
-<p style="display: flex; flex-flow: row nowrap; align-items: center; justify-content: flex-start;"><input
-        type="checkbox" class='show-again' id="welcome-screen-show-again" /> <label
-        for="welcome-screen-show-again">Don't show this screen again until next update.</label></p>
+</ul>