summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-08-25 19:57:45 +0200
committerHaru <haru@dotalux.com>2019-08-26 01:45:36 +0200
commitf0b91a79a0f8031d3cd6289ceafead93817bc4a7 (patch)
tree8ee750d89c7c0f3695a1660afa89ce975c2f4c79 /src/map/npc.c
parent29e6bbef1b7d4c2434cc6bc8e7a0226227ec6281 (diff)
downloadhercules-f0b91a79a0f8031d3cd6289ceafead93817bc4a7.tar.gz
hercules-f0b91a79a0f8031d3cd6289ceafead93817bc4a7.tar.bz2
hercules-f0b91a79a0f8031d3cd6289ceafead93817bc4a7.tar.xz
hercules-f0b91a79a0f8031d3cd6289ceafead93817bc4a7.zip
Prevent players from getting stuck when an MVP respawns while talking to its tombstone
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index c3dff5870..1e9e13b42 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1349,8 +1349,10 @@ static int npc_scriptcont(struct map_session_data *sd, int id, bool closing)
return 1;
}
- if(id != npc->fake_nd->bl.id) { // Not item script
- if ((npc->checknear(sd,target)) == NULL){
+ if (id != npc->fake_nd->bl.id) { // Not item script
+ if (sd->state.npc_unloaded != 0) {
+ sd->state.npc_unloaded = 0;
+ } else if ((npc->checknear(sd,target)) == NULL) {
ShowWarning("npc_scriptcont: failed npc->checknear test.\n");
return 1;
}