diff options
| author | shennetsind <ind@henn.et> | 2013-06-15 05:00:04 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-15 05:00:04 -0300 |
| commit | cf78bebc95e3387cf7fbe0720825bacb95c1b61a (patch) | |
| tree | e895ec5f3f9baa111476af18607ec292f06d9df6 /src/map/pc.c | |
| parent | 1dd4882c00b82d9a2f138211dbc2c8c542e2af88 (diff) | |
| parent | de3f4423058405636c76e05cd87a6eae0bfa7707 (diff) | |
| download | hercules-cf78bebc95e3387cf7fbe0720825bacb95c1b61a.tar.gz hercules-cf78bebc95e3387cf7fbe0720825bacb95c1b61a.tar.bz2 hercules-cf78bebc95e3387cf7fbe0720825bacb95c1b61a.tar.xz hercules-cf78bebc95e3387cf7fbe0720825bacb95c1b61a.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 155812836..ef70aad97 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6667,7 +6667,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { npc_script_event(sd,NPCE_DIE); // Clear anything NPC-related when you die and was interacting with one. - if (sd->npc_id) { + if (sd->npc_id || sd->npc_shopid) { if (sd->state.using_fake_npc) { clif->clearunit_single(sd->npc_id, CLR_OUTSIGHT, sd->fd); sd->state.using_fake_npc = 0; @@ -6678,6 +6678,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { sd->npc_menu = 0; sd->npc_id = 0; + sd->npc_shopid = 0; if (sd->st && sd->st->state != END) sd->st->state = END; } |