From b219f4aee69b2970e432107353da9ae2c5854f78 Mon Sep 17 00:00:00 2001
From: Vlyan <vlyan26@gmail.com>
Date: Tue, 11 Oct 2022 14:36:34 +0200
Subject: [PATCH] GM Toolbox : Left clic do only actors with an active player
 as owner.

---
 CHANGELOG.md                    | 3 +++
 system/scripts/actor.js         | 8 ++++++++
 system/scripts/gm/gm-monitor.js | 2 +-
 system/scripts/gm/gm-toolbox.js | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8121414..795aaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 Date format : day/month/year
 
+## 1.9.4 - ??/??/2022 - ?
+- GM Toolbox : Left clic do only actors with an active player as owner.
+
 ## 1.9.3 - 29/09/2022 - Combat Tracker
 - Fix for L5R combat tracker bar who have disappeared.
 
diff --git a/system/scripts/actor.js b/system/scripts/actor.js
index ed1505f..e603f19 100644
--- a/system/scripts/actor.js
+++ b/system/scripts/actor.js
@@ -278,6 +278,14 @@ export class ActorL5r5e extends Actor {
         return this.type === "army";
     }
 
+    /**
+     * Return true if this actor have an active player as owner
+     * @returns {boolean}
+     */
+    get hasPlayerOwnerActive() {
+        return game.users.find((u) => !!u.active && u.character?.id === this.id);
+    }
+
     /**
      * Return true if this actor can do a initiative roll
      * @returns {boolean}
diff --git a/system/scripts/gm/gm-monitor.js b/system/scripts/gm/gm-monitor.js
index 038ce27..ba11f89 100644
--- a/system/scripts/gm/gm-monitor.js
+++ b/system/scripts/gm/gm-monitor.js
@@ -91,7 +91,7 @@ export class GmMonitor extends FormApplication {
             actors = game.actors.filter((e) => ids.includes(e.id));
         } else {
             // If empty add pc with owner
-            actors = game.actors.filter((actor) => actor.type === "character" && actor.hasPlayerOwner);
+            actors = game.actors.filter((actor) => actor.type === "character" && actor.hasPlayerOwnerActive);
             this._saveActorsIds();
         }
 
diff --git a/system/scripts/gm/gm-toolbox.js b/system/scripts/gm/gm-toolbox.js
index f12f393..636c515 100644
--- a/system/scripts/gm/gm-toolbox.js
+++ b/system/scripts/gm/gm-toolbox.js
@@ -202,7 +202,7 @@ export class GmToolbox extends FormApplication {
             }
 
             // Manage left/right button
-            if (!isAll && (!actor.isCharacter || !actor.hasPlayerOwner)) {
+            if (!isAll && (!actor.isCharacter || !actor.hasPlayerOwnerActive)) {
                 continue;
             }