From 0bc85ae0f97a764c574abcffb65be45e72c2c801 Mon Sep 17 00:00:00 2001 From: Atemo Date: Fri, 14 Jan 2022 15:15:09 +0100 Subject: [PATCH] Updated pc_cant_act2 (#6513) Fixed #5087 Thanks to @idk-whoami --- src/map/pc.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/pc.hpp b/src/map/pc.hpp index c11a3b21e5..e3982c2ba4 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -1055,7 +1055,7 @@ extern JobDatabase job_db; static bool pc_cant_act2( struct map_session_data* sd ){ return sd->state.vending || sd->state.buyingstore || (sd->sc.opt1 && sd->sc.opt1 != OPT1_BURNING) || sd->state.trading || sd->state.storage_flag || sd->state.prevend || sd->state.refineui_open - || sd->state.stylist_open || sd->state.inventory_expansion_confirmation; + || sd->state.stylist_open || sd->state.inventory_expansion_confirmation || sd->npc_shopid; } // equals pc_cant_act2 and additionally checks for chat rooms and npcs static bool pc_cant_act( struct map_session_data* sd ){