diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
| commit | 71140a6d9bb8b15fdee82745b559db0ca6a0052d (patch) | |
| tree | 0337ec2f6a388fdfb9862e7823f67446206629ee /src/map/status.c | |
| parent | 16cb5fef019d99367ef818e7c1d52a8c2deb8162 (diff) | |
| download | hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.gz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.bz2 hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.xz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.zip | |
- Some cleaning of battle_drain, Evil Druid card should work now.
- Made status_damage allow damaging of objects not on a map, this should fix pet-catching making the mob never respawn again.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7946 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index ebb9d151e..a0483f0a9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -566,8 +566,10 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s if (status == &dummy_status || !status->hp) return 0; //Invalid targets: no damage or dead - if (!target->prev && !(flag&2)) - return 0; //Cannot damage a bl not on a map, except when "charging" hp/sp +// Let through. battle.c/skill.c have the whole logic of when it's possible or +// not to hurt someone (and this check breaks pet catching) [Skotlex] +// if (!target->prev && !(flag&2)) +// return 0; //Cannot damage a bl not on a map, except when "charging" hp/sp sc = status_get_sc(target); |