summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-15 05:54:51 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-15 05:54:51 +0000
commit5bd153de6df78974797b3571df90ddc32fa5af57 (patch)
tree71d353ddca941edce868a383dfdda86153dbb3ca /src
parent913bf83f9b9a0df58bc9ff74613003d247a2fde4 (diff)
downloadhercules-5bd153de6df78974797b3571df90ddc32fa5af57.tar.gz
hercules-5bd153de6df78974797b3571df90ddc32fa5af57.tar.bz2
hercules-5bd153de6df78974797b3571df90ddc32fa5af57.tar.xz
hercules-5bd153de6df78974797b3571df90ddc32fa5af57.zip
monsters no longer use rudeattacked skills when they receive reflected damage from a player who died, bugreport:3912
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15131 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/chrif.c2
-rw-r--r--src/map/mob.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 3e603969c..6139ad132 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -38,7 +38,7 @@ static DBMap* auth_db; // int id -> struct auth_node*
static const int packet_len_table[0x3d] = { // U - used, F - free
60, 3,-1,27,10,-1, 6,-1, // 2af8-2aff: U->2af8, U->2af9, U->2afa, U->2afb, U->2afc, U->2afd, U->2afe, U->2aff
- 6,-1,18, 7,-1,35,30, 10, // 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, F->2b07
+ 6,-1,18, 7,-1,35,30, 10, // 2b00-2b07: U->2b00, U->2b01, U->2b02, U->2b03, U->2b04, U->2b05, U->2b06, U->2b07
6,30, 0, 0,86, 7,44,34, // 2b08-2b0f: U->2b08, U->2b09, F->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
11,10,10, 0,11, 0,266,10, // 2b10-2b17: U->2b10, U->2b11, U->2b12, F->2b13, U->2b14, F->2b15, U->2b16, U->2b17
2,10, 2,-1,-1,-1, 2, 7, // 2b18-2b1f: U->2b18, U->2b19, U->2b1a, U->2b1b, U->2b1c, U->2b1d, U->2b1e, U->2b1f
diff --git a/src/map/mob.c b/src/map/mob.c
index cd7a234bb..ac8b1bd89 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1367,7 +1367,6 @@ static bool mob_ai_sub_hard(struct mob_data *md, unsigned int tick)
if( md->bl.m != abl->m || abl->prev == NULL
|| (dist = distance_bl(&md->bl, abl)) >= MAX_MINCHASE // Attacker longer than visual area
|| battle_check_target(&md->bl, abl, BCT_ENEMY) <= 0 // Attacker is not enemy of mob
- || status_isdead(abl) // Attacker is Dead (Reflecting Damage?)
|| (battle_config.mob_ai&0x2 && !status_check_skilluse(&md->bl, abl, 0, 0)) // Cannot normal attack back to Attacker
|| (!battle_check_range(&md->bl, abl, md->status.rhw.range) // Not on Melee Range and ...
&& ( // Reach check