Merge pull request #1610 from Miskatonic-Investigative-Society/develop

7.1
Miskatonic-Investigative-Society · Oct 21, 2024 · c2f6b8f · c2f6b8f
2 parents 822a7d9 + 07322f7
commit c2f6b8f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -9,6 +9,12 @@ Happy gaming !
 
 When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.
 
+## Version 7.1
+
+When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.
+
+- Fix FoundryVTT v11 breaking issue
+
 ## Version 7.0
 
 **_!! FoundryVTT v10 is no longer supported !!_**

diff --git a/module/apps/coc7-clickable-events.js b/module/apps/coc7-clickable-events.js
@@ -1,8 +1,16 @@
 /* global canvas, CONFIG, CONST, DocumentSheetConfig, foundry, fromUuid, game, NotesLayer, RegionBehavior, TokenLayer */
-const { RegionBehaviorType } = foundry.data.regionBehaviors
+const { RegionBehaviorType } = foundry.data.regionBehaviors ?? {} // FoundryVTT v11
 
-export default class CoC7ClickableEvents extends RegionBehaviorType {
+// FoundryVTT v11
+const RegionBehaviorTypeClass = (typeof RegionBehaviorType === 'undefined' ? class {} : RegionBehaviorType)
+
+export default class CoC7ClickableEvents extends RegionBehaviorTypeClass {
   static initSelf () {
+    // FoundryVTT v11
+    if (!foundry.utils.isNewerVersion(game.version, '12')) {
+      return
+    }
+
     Object.assign(CONFIG.RegionBehavior.dataModels, {
       coc7ClickableEvents: CoC7ClickableEvents
     })

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "id": "CoC7",
   "title": "Call of Cthulhu 7th Edition",
   "description": "An implementation of the Call of Cthulhu 7th Edition game system for Foundry Virtual Tabletop.",
-  "version": "7.0",
+  "version": "7.1",
   "authors": [
     {
       "name": "Miskatonic Investigative Society"
@@ -207,7 +207,7 @@
   "secondaryTokenAttribute": "attribs.san",
   "url": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT",
   "manifest": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/latest/download/system.json",
-  "download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/7.0/system.zip",
+  "download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/7.1/system.zip",
   "media": [
     {
       "type": "setup",