diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-28 12:57:34 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-28 12:57:34 +0000 |
| commit | 83a75b6e94e5092edbdce71ddf2cba16a747e4fc (patch) | |
| tree | 6bc6d6786aa49410adc95ad273971ae4797b79dc /src/map/npc.c | |
| parent | 056248cd0eb6614ffdc436be47a54e0aa2f9a559 (diff) | |
| download | hercules-83a75b6e94e5092edbdce71ddf2cba16a747e4fc.tar.gz hercules-83a75b6e94e5092edbdce71ddf2cba16a747e4fc.tar.bz2 hercules-83a75b6e94e5092edbdce71ddf2cba16a747e4fc.tar.xz hercules-83a75b6e94e5092edbdce71ddf2cba16a747e4fc.zip | |
- Corrected skill_check_condition to not delete items right away for certain skills that do the deletion themselves. Fixes several skills consuming items twice.
- Dispel's success rate is no longer affected by MDEF
- You are no longer blocked from being warped when standing in a warp while in a duel.
- Duels are now automatically ended when you warp out of the map you are in.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11836 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 12d8f0e9b..7b44c4afa 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -751,8 +751,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y) switch(map[m].npc[i]->subtype) { case WARP: // hidden chars cannot use warps -- is it the same for scripts too? - if (sd->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) || - (!battle_config.duel_allow_teleport && sd->duel_group)) // duel rstrct [LuzZza] + if (sd->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK)) break; pc_setpos(sd,map[m].npc[i]->u.warp.mapindex,map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0); break; |