diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-01 21:10:58 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-01 21:10:58 +0000 |
| commit | 022f002f01d42e9adaf5c84aec0290bafb450fde (patch) | |
| tree | 062d4d3c0ba59970dbc43f0598655068b75553b2 /src/map/pc.c | |
| parent | 45d3f5988a75efbf437e7916b9fe9febe61e2352 (diff) | |
| download | hercules-022f002f01d42e9adaf5c84aec0290bafb450fde.tar.gz hercules-022f002f01d42e9adaf5c84aec0290bafb450fde.tar.bz2 hercules-022f002f01d42e9adaf5c84aec0290bafb450fde.tar.xz hercules-022f002f01d42e9adaf5c84aec0290bafb450fde.zip | |
- Fixed pc_damage setting your canlog_tick even if the damage has no source (eg: poison, berserk)
- Berserk's aspd bonus now stacks with other aspd bonuses, and is unaffected by Quagmire/Forget-me-not.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6916 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 91732ab2a..f39b6b33a 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4510,9 +4510,6 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h skill_rest(sd,0);
}
- if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support)
- pet_target_check(sd,src,1);
-
clif_updatestatus(sd,SP_HP);
if (sd->battle_status.hp<sd->battle_status.max_hp>>2)
@@ -4526,6 +4523,12 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h }
}
+ if(!src || src == &sd->bl)
+ return;
+
+ if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support)
+ pet_target_check(sd,src,1);
+
sd->canlog_tick = gettick();
return;
}
|