diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 02:12:57 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 02:12:57 +0000 |
| commit | 557dea285150a612bb45afaad68b02154df9ff93 (patch) | |
| tree | 8cbe1e352bbec47f5b6e3293a7c131186cf32c35 | |
| parent | 87eb80e0f451269a8dcaf09de1e8131cbbf682fb (diff) | |
| download | hercules-557dea285150a612bb45afaad68b02154df9ff93.tar.gz hercules-557dea285150a612bb45afaad68b02154df9ff93.tar.bz2 hercules-557dea285150a612bb45afaad68b02154df9ff93.tar.xz hercules-557dea285150a612bb45afaad68b02154df9ff93.zip | |
* Do not log damage if it's done by mob itself (bugreport:2933) [Inkfish]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13716 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0d6b9722f..c5bb0be5f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2009/05/03 + * Do not log damage if it's done by mob itself (bugreport:2933) [Inkfish] 2009/05/02 * Spirit of Bard and Dancer now only works for mastered skills (bugreport:3037) [Playtester] - also fixed an outdated comment in the source code diff --git a/src/map/mob.c b/src/map/mob.c index 4577ce0bd..59182fcbb 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1800,6 +1800,8 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage) return; //Do nothing for absorbed damage. if( !damage && !(src->type&DEFAULT_ENEMY_TYPE(md)) ) return; //Do not log non-damaging effects from non-enemies. + if( src->id == md->bl.id ) + return; //Do not log self-damage. switch( src->type ) { |