summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-30 13:11:13 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-30 13:11:13 +0000
commitdb0f3228b73597f9c1d6f2cd661a09621d9b48c3 (patch)
tree4c88d114dd27e1958b311542c16581d2c041a368
parentbdc6551ea5f86f85c5edeb1b6ae388b1b01a3427 (diff)
downloadhercules-db0f3228b73597f9c1d6f2cd661a09621d9b48c3.tar.gz
hercules-db0f3228b73597f9c1d6f2cd661a09621d9b48c3.tar.bz2
hercules-db0f3228b73597f9c1d6f2cd661a09621d9b48c3.tar.xz
hercules-db0f3228b73597f9c1d6f2cd661a09621d9b48c3.zip
* [Fixed]
- Pets attacking even master is dead git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6841 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 40ecf3056..e39f0ac0f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/05/30
+ * [Fixed]:
+ - Pets attacking even master is dead. [Lance]
* Fixed battle_calc_weapon_attack damage capping damage to a minimum of 0
(negative values should be allowed when attack is absorbed by target's
element) [Skotlex]
diff --git a/src/map/pc.c b/src/map/pc.c
index 1d5cd2d28..a0d8fe17e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4445,6 +4445,10 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
if(sd->pet.intimate < 0)
sd->pet.intimate = 0;
clif_send_petdata(sd,1,sd->pet.intimate);
+ if(sd->pd->target_id){ // Unlock all targets...
+ unit_unattackable(&sd->pd->bl);
+ sd->pd->target_id = 0;
+ }
}
// Leave duel if you die [LuzZza]