summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-10-18 17:46:54 +0200
committerGitHub <noreply@github.com>2019-10-18 17:46:54 +0200
commit1f6eebe5421534c0d2a29e793ae8ce0328913c7c (patch)
tree7f484809bed260ab519d5c956ec55f1e7e3f28bc /src/map
parent79abae03cea51669df6dda2d006ddb85677916d4 (diff)
parentc82f6fdf3d7c223f2d07ea15dfa1f1c0c2c8a033 (diff)
downloadhercules-1f6eebe5421534c0d2a29e793ae8ce0328913c7c.tar.gz
hercules-1f6eebe5421534c0d2a29e793ae8ce0328913c7c.tar.bz2
hercules-1f6eebe5421534c0d2a29e793ae8ce0328913c7c.tar.xz
hercules-1f6eebe5421534c0d2a29e793ae8ce0328913c7c.zip
Merge pull request #2555 from guilherme-gm/201910-fix-vending
Fixes close merchant vending
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index d45929190..3abbc2c36 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14305,7 +14305,7 @@ static void clif_parse_CloseVending(int fd, struct map_session_data *sd) __attri
/// 012e
static void clif_parse_CloseVending(int fd, struct map_session_data *sd)
{
- if (pc_istrading(sd) || pc_isdead(sd))
+ if (sd->npc_id || sd->state.buyingstore || sd->state.trading)
return;
vending->close(sd);