From 2816068897b2988bbb391246008ab1001e18b631 Mon Sep 17 00:00:00 2001
From: Vlyan <vlyan26@gmail.com>
Date: Sun, 6 Jun 2021 16:30:54 +0200
Subject: [PATCH] Fixed issue #23 "Token image does not save"

---
 CHANGELOG.md            |  1 +
 system/scripts/actor.js | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bf084a..8815cb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.3.1 - Scholar helper
 - Added a Journal Compendium for School Curriculums.
 - Fix for the "bought_at_rank" value when an Item was on dropped on a sheet.
+- Fix for issue #23 "Token image does not save".
 
 ## 1.3.0 - Foundry 0.8 Compatibility
 __! Be certain to carefully back up any critical user data before installing this update !__
diff --git a/system/scripts/actor.js b/system/scripts/actor.js
index 30af8f5..1ced2b4 100644
--- a/system/scripts/actor.js
+++ b/system/scripts/actor.js
@@ -65,12 +65,17 @@ export class ActorL5r5e extends Actor {
      */
     async update(data = {}, context = {}) {
         // Need a _id
-        if (!data["_id"]) {
+        if (!data._id) {
             data["_id"] = this.id;
         }
 
-        // Fix for token image unliked from character... dunno why
-        if (data.img) {
+        // Update the token image if the sheet image changed, but only if they are the same and linked to actor
+        if (
+            data.img &&
+            this.data.img === this.data.token.img &&
+            this.data.img !== data.img &&
+            (data.token?.actorLink || (data.token?.actorLink === undefined && this.data.token.actorLink))
+        ) {
             data["token.img"] = data.img;
         }