Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Monsters placing traps (see #1998)

Browse Source 
* Monsters can no longer place traps on themselves, the skill will fail
This commit is contained in:
Playtester
2017-03-08 22:34:44 +01:00
parent 08e862c0e0
commit 8f82d046c0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/skill.c
View File

@@ -3724,10 +3724,12 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, uint16
if (!isNearNPC) { //Doesn't check the NPC range
//If the caster is a monster/NPC, only check for players. Otherwise just check characters
if (bl->type == BL_PC)
if (bl->type&battle_config.skill_nofootset)
type = BL_CHAR;
else if(bl->type == BL_MOB)
type = BL_MOB; //Monsters can never place traps on top of each other regardless of setting
else
type = BL_PC;
return 0; //Don't check
} else
type = BL_NPC;
@@ -11303,8 +11305,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr_t data)
if (sd) clif_skill_fail(sd,ud->skill_id,USESKILL_FAIL_DUPLICATE_RANGEIN,0);
break;
}
if( src->type&battle_config.skill_nofootset &&
skill_get_unit_flag(ud->skill_id)&UF_NOFOOTSET &&
if( skill_get_unit_flag(ud->skill_id)&UF_NOFOOTSET &&
skill_check_unit_range2(src,ud->skillx,ud->skilly,ud->skill_id,ud->skill_lv,false)
)
{