|
@@ -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 ){
|