diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-23 01:10:36 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-23 01:10:36 +0000 |
| commit | 252d548e533389f18b80c8a35976eca893791355 (patch) | |
| tree | 87e2acd4e850e6e2cdde2440ae58baf951a8eb9b /src/map | |
| parent | 0148769f9d09dc63e7fc71b176860df96f01d29e (diff) | |
| download | hercules-252d548e533389f18b80c8a35976eca893791355.tar.gz hercules-252d548e533389f18b80c8a35976eca893791355.tar.bz2 hercules-252d548e533389f18b80c8a35976eca893791355.tar.xz hercules-252d548e533389f18b80c8a35976eca893791355.zip | |
Fixed bugreport:2313 where a player interacting with a NPC would still be queued when died and therefore causing problems with further NPC interactions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16946 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 5fae9350f..9e3b642d6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1343,6 +1343,9 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s clif_clearunit_area(target,CLR_DEAD); skill_unit_move(target,gettick(),4); skill_cleartimerskill(target); + + if(target->type == BL_PC && ((TBL_PC*)target)->npc_id && flag == 1) + npc_event_dequeue((TBL_PC*)target); } return hp+sp; |