diff options
| author | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-21 20:45:40 +0000 |
|---|---|---|
| committer | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-21 20:45:40 +0000 |
| commit | e53ce7ef5610a1fb1dc3597e56c6610e026828a5 (patch) | |
| tree | 39b2b505e9e58a960ae472055e0a765cf1345bcb /src/map | |
| parent | a4183d04185255b16decebd8d7a3dd6c7549a3dc (diff) | |
| download | hercules-e53ce7ef5610a1fb1dc3597e56c6610e026828a5.tar.gz hercules-e53ce7ef5610a1fb1dc3597e56c6610e026828a5.tar.bz2 hercules-e53ce7ef5610a1fb1dc3597e56c6610e026828a5.tar.xz hercules-e53ce7ef5610a1fb1dc3597e56c6610e026828a5.zip | |
* Fixed a bug where the "OnMyMobDead" event wouldn't trigger if the mob was killed and never attacked. (bugreport: 1725)
* Reworded a comment in can_copy to make more sense.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12870 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mob.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 64aaf748f..9859de698 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2551,6 +2551,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) pc_setglobalreg(mvp_sd,"killerrid",sd?sd->bl.id:0); npc_event(mvp_sd,md->npc_event,0); } + else + npc_event_do(md->npc_event); + md->status.hp = 1; } else if (mvp_sd) { //lordalfa pc_setglobalreg(mvp_sd,"killedrid",md->class_); diff --git a/src/map/skill.c b/src/map/skill.c index db4605afb..3baafef54 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -296,8 +296,8 @@ int can_copy (struct map_session_data *sd, int skillid, struct block_list* bl) return (sd->status.class_ == JOB_STALKER); } - //don't copy increase agi or blessing from someone who is inflicted with sc_changeundead - if ((skillid == AL_INCAGI || skillid == AL_BLESSING) && sd->sc.data[SC_CHANGEUNDEAD]) + //Added so plagarize can't copy agi/bless if you're undead since it damages you + if ((skillid == AL_INCAGI || skillid == AL_BLESSING)) return 0; return 1; |