diff options
author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-22 15:36:41 +0000 |
---|---|---|
committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-22 15:36:41 +0000 |
commit | a4238c21464e3bf61150795d49f9478293cae586 (patch) | |
tree | 6a57b1b11073ef6175de38fb37a3c1d334366e56 /src/map/unit.c | |
parent | 4b9b06cc7dad8a7dd9ba729fbed753b7acd49367 (diff) | |
download | hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.gz hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.bz2 hercules-a4238c21464e3bf61150795d49f9478293cae586.tar.xz hercules-a4238c21464e3bf61150795d49f9478293cae586.zip |
NPC_STOP now stops both sides and will be canceled if either side teleports or dies.(bugreport:3099)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13803 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r-- | src/map/unit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 3dd1b30e4..44dbaf741 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1750,7 +1750,7 @@ int unit_remove_map_(struct block_list *bl, int clrtype, const char* file, int l status_change_end(bl,SC_BASILICA,-1); status_change_end(bl,SC_ANKLE,-1); status_change_end(bl,SC_TRICKDEAD,-1); - status_change_end(bl,SC_BLADESTOP,-1); + status_change_end(bl,SC_BLADESTOP_WAIT,-1); status_change_end(bl,SC_RUN,-1); skill_stop_dancing(bl); status_change_end(bl,SC_WARM,-1); @@ -1765,6 +1765,7 @@ int unit_remove_map_(struct block_list *bl, int clrtype, const char* file, int l if (sc->data[SC_GOSPEL] && sc->data[SC_GOSPEL]->val4 == BCT_SELF) status_change_end(bl,SC_GOSPEL,-1); status_change_end(bl,SC_CHANGE,-1); + status_change_end(bl,SC_STOP,-1); } if (bl->type&BL_CHAR) { |