From c150d923f70324d8823266c45a6721a023790941 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Mon, 22 Jan 2024 16:44:57 -0600
Subject: [PATCH] Map Tools - Fix tools showing after item is dropped out of
 inventory (#9749)

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
---
 .../maptools/functions/fnc_updateMapToolMarkers.sqf | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/maptools/functions/fnc_updateMapToolMarkers.sqf b/addons/maptools/functions/fnc_updateMapToolMarkers.sqf
index fbad42c36e..92bb481326 100644
--- a/addons/maptools/functions/fnc_updateMapToolMarkers.sqf
+++ b/addons/maptools/functions/fnc_updateMapToolMarkers.sqf
@@ -25,15 +25,8 @@ if (GVAR(plottingBoard_Shown) == 0) then {
             _y set [4, 0];
         };
     } forEach GVAR(plottingBoard_markers);
-};
-
-if (((GVAR(mapTool_Shown) == 0) && {GVAR(plottingBoard_Shown) == 0}) || {
-    private _uniqueItems = ACE_player call EFUNC(common,uniqueItems);
-
-    !(("ACE_MapTools" in _uniqueItems) || {"ACE_PlottingBoard" in _uniqueItems})
-}) exitWith {};
-
-if (GVAR(plottingBoard_Shown) > 0) then {
+} else {
+    if !([ACE_player, "ACE_PlottingBoard"] call EFUNC(common,hasItem)) exitWith {};
     if (GVAR(plottingBoard_moveToMouse)) then {
         GVAR(plottingBoard_pos) = _mapCtrl ctrlMapScreenToWorld getMousePosition;
         GVAR(plottingBoard_moveToMouse) = false;  // we only need to do this once after opening the map tool
@@ -97,7 +90,7 @@ if (GVAR(plottingBoard_Shown) > 0) then {
     } forEach GVAR(plottingBoard_markers);
 };
 
-if (GVAR(mapTool_Shown) > 0) then {
+if ((GVAR(mapTool_Shown) > 0) && {[ACE_player, "ACE_MapTools"] call EFUNC(common,hasItem)}) then {
     // Open map tools in center of screen when toggled to be shown
     if (GVAR(mapTool_moveToMouse)) then {
         GVAR(mapTool_pos) = _mapCtrl ctrlMapScreenToWorld getMousePosition;