summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-07 16:36:39 -0200
committershennetsind <ind@henn.et>2013-02-07 16:36:39 -0200
commit6fb716102722944463d9cec9be8f46760fde9616 (patch)
tree8d4137f7080a6ea1240012a6f2ba8f480bd58680
parent324073aff5d869d9afdff79f24e14d66dbfd057c (diff)
downloadhercules-6fb716102722944463d9cec9be8f46760fde9616.tar.gz
hercules-6fb716102722944463d9cec9be8f46760fde9616.tar.bz2
hercules-6fb716102722944463d9cec9be8f46760fde9616.tar.xz
hercules-6fb716102722944463d9cec9be8f46760fde9616.zip
Fixed Bug #7045
Fire Pillar is now removed by land protector, and no longer can be cast over land protector. http://hercules.ws/board/tracker/issue-7045-fire-pillar-and-land-protector/ Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/map/skill.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 972aa8129..ad52a5c1f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10612,6 +10612,8 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, uint16 skill
break;
case WZ_FIREPILLAR:
+ if( map_getcell(src->m, x, y, CELL_CHKLANDPROTECTOR) )
+ return NULL;
if((flag&1)!=0)
limit=1000;
val1=skill_lv+2;
@@ -14712,7 +14714,7 @@ static int skill_cell_overlap(struct block_list *bl, va_list ap)
skill_delunit(unit);
return 1;
}
- if( !(skill_get_inf2(unit->group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP)) ) { //It deletes everything except songs/dances and traps
+ if( !(skill_get_inf2(unit->group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP)) || unit->group->skill_id == WZ_FIREPILLAR ) { //It deletes everything except songs/dances and traps
skill_delunit(unit);
return 1;
}