diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-04 21:44:43 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-04 21:44:43 +0000 |
| commit | d03ac5e84b0a5048e4314b372a0e4c7966df7792 (patch) | |
| tree | f6cd2ff3c1818e5e0c9212f2a6737b297b796ec7 /src/map/status.c | |
| parent | a7f90716920507dae02ebc32c0d8a2feea49b1a3 (diff) | |
| download | hercules-d03ac5e84b0a5048e4314b372a0e4c7966df7792.tar.gz hercules-d03ac5e84b0a5048e4314b372a0e4c7966df7792.tar.bz2 hercules-d03ac5e84b0a5048e4314b372a0e4c7966df7792.tar.xz hercules-d03ac5e84b0a5048e4314b372a0e4c7966df7792.zip | |
- Killed mobs with NPC_REBIRTH skill used should not drop items again. (Aegis test)
- Monsters with SC_KAIZEL should not trigger event script until.
- Monsters NPC_REBIRTH should not be casted if no source (killmonster script or @killmonster)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13047 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index 623fc3597..35a61a962 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -742,12 +742,17 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s } } - if (!(flag&8) && sc && sc->data[SC_KAIZEL]) { //flag&8 = disable Kaizel + if( !(flag&8) && sc && sc->data[SC_KAIZEL] ) + { //flag&8 = disable Kaizel int time = skill_get_time2(SL_KAIZEL,sc->data[SC_KAIZEL]->val1); status_revive(target, sc->data[SC_KAIZEL]->val2, 0); status_change_clear(target,0); clif_skill_nodamage(target,target,ALL_RESURRECTION,1,1); sc_start(target,status_skill2sc(PR_KYRIE),100,10,time); + + if( target->type == BL_MOB ) + ((TBL_MOB*)target)->state.rebirth = 1; + return hp+sp; } |