From 68dc3d890b5e7e4ef0e81a2d0c393613dc9e48a7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 12 Jul 2006 14:44:02 +0000 Subject: [PATCH] - status_damage will no longer fail when the target is not on a map AND the flag is 2 (charge rather than damage). Fixes SP-draining status changes ending suddenly when in-between maps. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7635 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ src/map/status.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b2dd8b931e..53cff79e21 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/07/12 + * status_damage will no longer fail when the target is not on a map AND the + flag is 2 (charge rather than damage). Fixes SP-draining status changes + ending suddenly when in-between maps. [Skotlex] * Fixed the IP value being apparently incorrectly casted before inserting into the loginlog table on "connect success" events. [Skotlex] * Fixed Cart Termination's damage. [Skotlex] diff --git a/src/map/status.c b/src/map/status.c index b3a77dadff..fc0fe1ada7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -523,8 +523,11 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s status = status_get_status_data(target); - if (status == &dummy_status || !status->hp || !target->prev) - return 0; //Invalid targets: no damage, dead, not on a map. + 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 sc = status_get_sc(target);