summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-09 09:20:50 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-09 09:20:50 +0000
commitcf51fb6a2e0e24aa24dddcec2509a7046bfbb113 (patch)
treeca6c514b574568d15161f80c78e01846f6219724 /src/map
parent11a990a0e4a09d087219afb123eeba5d0ff1cdb6 (diff)
downloadhercules-cf51fb6a2e0e24aa24dddcec2509a7046bfbb113.tar.gz
hercules-cf51fb6a2e0e24aa24dddcec2509a7046bfbb113.tar.bz2
hercules-cf51fb6a2e0e24aa24dddcec2509a7046bfbb113.tar.xz
hercules-cf51fb6a2e0e24aa24dddcec2509a7046bfbb113.zip
Fixed Fire Pillar (and any future splash damage magical trap) not working on Land Protector.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12798 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 160595566..4d640f6cb 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6539,7 +6539,8 @@ static int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, un
nullpo_retr(0, sg=src->group);
nullpo_retr(0, ss=map_id2bl(sg->src_id));
- if (skill_get_type(sg->skill_id) == BF_MAGIC && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR))
+ if (skill_get_type(sg->skill_id) == BF_MAGIC && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR)
+ && !skill_get_inf2(sg->skill_id) == INF2_TRAP) //Traps work on top of land protector, magical or not [Brain]
return 0; //AoE skills are ineffective. [Skotlex]
sc = status_get_sc(bl);