diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-22 19:41:32 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-22 19:41:32 +0000 |
| commit | 13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce (patch) | |
| tree | da80ec5e061d804a851c2ed7de54162bc3fe21c3 /src/map/npc.c | |
| parent | ca6687180056b8f89d7f16827dc22eeacce5f211 (diff) | |
| download | hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.gz hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.bz2 hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.xz hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.zip | |
Community Contribution Time!
* Fixed bugreport:6303: official servers now always reshuffle the dice emoticon. To disable change the configuration to 'no'. Thanks to Vianna for providing the information!
* Fixed bugreport:7026: creating a guild and exiting in a short amount of time wouldn't save the guild properly. Thank you clydelion!
* Fixed bugreport:7030: removed warning introduced by r16987. Thanks Mr. Brian and Sir BuildBot for pointing!
* Fixed bugreport:7031: if a player crashed during warp it would cause OnTouch_ to not trigger anymore. Thanks to flaviojs (eA-r15185) for the fix and Napster for pointing out!
* Fixed bugreport:7032: Clementia and Canto Candidus give an additional of +1 str/agi/dex each 10 job levels (from caster). Thanks solvent!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17034 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index c3af52607..c11770a1e 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -830,6 +830,8 @@ int npc_touch_areanpc_sub(struct block_list *bl, va_list ap) pc_id = va_arg(ap,int); name = va_arg(ap,char*); + if( sd->state.warping ) + return 0; if( pc_ishiding(sd) ) return 0; if( pc_id == sd->bl.id ) |