From 4c007393536cf8e2e2b8677f92e834b53a048276 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sat, 14 Jan 2012 11:27:45 +0000 Subject: Fixed hunter traps so that they MAY hit their owner in pvp areas, bugreport:5228 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15451 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index 1353a1bfb..2195c101a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4152,13 +4152,14 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case BL_SKILL: { struct skill_unit *su = (struct skill_unit *)src; + int inf2; if (!su->group) return 0; - - if (su->group->src_id == target->id) - { - int inf2; - inf2 = skill_get_inf2(su->group->skill_id); + if( 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 + if (su->group->src_id == target->id) { if (inf2&INF2_NO_TARGET_SELF) return -1; if (inf2&INF2_TARGET_SELF) -- cgit v1.2.3-60-g2f50