Bump migration version. Fix some issues with non-DataModel migrations.

foundryvtt · Jan 10, 2023 · 4af6f42 · 4af6f42
1 parent 2b0755b
commit 4af6f42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/module/data/item/templates/equippable-item.mjs b/module/data/item/templates/equippable-item.mjs
@@ -21,6 +21,7 @@ export default class EquippableItemTemplate extends foundry.abstract.DataModel {
   /** @inheritdoc */
   static migrateData(source) {
     EquippableItemTemplate.#migrateAttunement(source);
+    EquippableItemTemplate.#migrateEquipped(source);
   }
 
   /* -------------------------------------------- */
@@ -33,4 +34,14 @@ export default class EquippableItemTemplate extends foundry.abstract.DataModel {
     if ( (source.attuned === undefined) || (source.attunement !== undefined) ) return;
     source.attunement = source.attuned ? CONFIG.DND5E.attunementTypes.ATTUNED : CONFIG.DND5E.attunementTypes.NONE;
   }
+
+  /* -------------------------------------------- */
+
+  /**
+   * Migrate the equipped field.
+   * @param {object} source  The candidate source data from which the model will be constructed.
+   */
+  static #migrateEquipped(source) {
+    if ( source.equipped === null ) source.equipped = false;
+  }
 }
diff --git a/module/migration.mjs b/module/migration.mjs
@@ -350,7 +350,7 @@ export const migrateMacroData = function(macro, migrationData) {
  */
 export const migrateSceneData = function(scene, migrationData) {
   const tokens = scene.tokens.map(token => {
-    const t = token.toObject();
+    const t = token instanceof foundry.abstract.DataModel ? token.toObject() : token;
     const update = {};
     _migrateTokenImage(t, update);
     if ( Object.keys(update).length ) foundry.utils.mergeObject(t, update);
@@ -487,7 +487,7 @@ function _migrateDocumentIcon(document, updateData, {iconMap, field="img"}={}) {
  */
 function _migrateEffectArmorClass(effect, updateData) {
   let containsUpdates = false;
-  const changes = effect.changes.map(c => {
+  const changes = (effect.changes || []).map(c => {
     if ( c.key !== "system.attributes.ac.base" ) return c;
     c.key = "system.attributes.ac.armor";
     containsUpdates = true;

diff --git a/system.json b/system.json
@@ -162,7 +162,7 @@
   "gridUnits": "ft",
   "primaryTokenAttribute": "attributes.hp",
   "flags": {
-    "needsMigrationVersion": "2.0.2",
+    "needsMigrationVersion": "2.1.0",
     "compatibleMigrationVersion": "0.8"
   }
 }