summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 19:47:55 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 19:47:55 +0000
commitf872adf65b9f25926ec3e0d8369a97e0c95e86a4 (patch)
tree587d93b541f3cd852811ad28c224c29b327fb526 /src
parent4f05322208a4491a3b3d7adab59a0fab4f8d87f5 (diff)
downloadhercules-f872adf65b9f25926ec3e0d8369a97e0c95e86a4.tar.gz
hercules-f872adf65b9f25926ec3e0d8369a97e0c95e86a4.tar.bz2
hercules-f872adf65b9f25926ec3e0d8369a97e0c95e86a4.tar.xz
hercules-f872adf65b9f25926ec3e0d8369a97e0c95e86a4.zip
Fixed bug with hunter traps working on mobs when cast by other mobs, bugreport:5278
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15559 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 6cf116db4..ebea3a44f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4192,7 +4192,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
int inf2 = 0;
if (!su->group)
return 0;
- if( battle_config.vs_traps_bctall &&
+ if( battle_config.vs_traps_bctall && (target->type&battle_config.vs_traps_bctall) &&
(inf2 = skill_get_inf2(su->group->skill_id))&INF2_TRAP &&
map_flag_vs(src->m) )
return 1;//traps may target everyone