diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-23 03:26:49 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-23 03:26:49 +0000 |
| commit | b77c66e953ed744e59e77a750ea8e725bb36d55e (patch) | |
| tree | c9968e6ed89d467f3d6556b043cb6a259979c4f5 /src/map/battle.c | |
| parent | beffc4eecbce7d0d869aef0d3cc49d732f87e514 (diff) | |
| download | hercules-b77c66e953ed744e59e77a750ea8e725bb36d55e.tar.gz hercules-b77c66e953ed744e59e77a750ea8e725bb36d55e.tar.bz2 hercules-b77c66e953ed744e59e77a750ea8e725bb36d55e.tar.xz hercules-b77c66e953ed744e59e77a750ea8e725bb36d55e.zip | |
- Updated Box of thunder to use "agi up" effect for 30 secs instead of NPC Agi Up for 20.
- Guild expulsion now will fail when the character to be kicked is in a guild castle (rather than checking for the character doing the expulsion)
- pk damage reduction settings now will take effect only on Player VS player damage.
- Fixed produce_db2.txt entries overwriting produce_db.txt ones.
- Fixed item-granted/plagiarized skills unlocking skill trees when only your real learned level should.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9899 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e1db71d4f..1cce2fcba 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -486,7 +486,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if (sc && sc->count) { } */ - if (battle_config.pk_mode && sd && damage) + if (battle_config.pk_mode && sd && bl->type == BL_PC && damage) { if (flag & BF_SKILL) { //Skills get a different reduction than non-skills. [Skotlex] if (flag&BF_WEAPON) |