From 71140a6d9bb8b15fdee82745b559db0ca6a0052d Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 28 Jul 2006 13:33:51 +0000 Subject: - 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 --- src/map/status.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/status.c') 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); -- cgit v1.2.3-70-g09d2