diff options
author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-26 00:52:01 +0000 |
---|---|---|
committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-26 00:52:01 +0000 |
commit | a337cab31a823d52f405462beb54e0135260b9ba (patch) | |
tree | c14b455011c820a5eaa8ae68a8f113227e731c91 /src/map/status.c | |
parent | b11bf6e1604097711291265f927e79e8f2af5c54 (diff) | |
download | hercules-a337cab31a823d52f405462beb54e0135260b9ba.tar.gz hercules-a337cab31a823d52f405462beb54e0135260b9ba.tar.bz2 hercules-a337cab31a823d52f405462beb54e0135260b9ba.tar.xz hercules-a337cab31a823d52f405462beb54e0135260b9ba.zip |
-Fix bugreport:6930 heal -Hp,0; percentheal -100,0; causing crashmap
-Upd bugreport:6751 with MarkZD followup patch
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16969 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index af0b7e148..a239be0a1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1619,7 +1619,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int if (sc && sc->count) { - if (sc->opt1 >0 && (sc->opt1 != OPT1_CRYSTALIZE && src->type != BL_MOB) && sc->opt1 != OPT1_BURNING && skill_num != SR_GENTLETOUCH_CURE) { //Stuned/Frozen/etc + if (skill_num != RK_REFRESH && sc->opt1 >0 && (sc->opt1 != OPT1_CRYSTALIZE && src->type != BL_MOB) && sc->opt1 != OPT1_BURNING && skill_num != SR_GENTLETOUCH_CURE) { //Stuned/Frozen/etc if (flag != 1) //Can't cast, casted stuff can't damage. return 0; if (!(skill_get_inf(skill_num)&INF_GROUND_SKILL)) @@ -8599,6 +8599,7 @@ int status_change_start(struct block_list *bl,enum sc_type type,int rate,int val break; case SC_SLEEP: case SC_DEEPSLEEP: + opt_flag = 0; sc->opt1 = OPT1_SLEEP; break; case SC_BURNING: |