- Removed SP_DISGUISE from the bonus list.

- Moved Sharp Shooting display to the block with Auto-Counter (since that's the other skill that can show critical as well)
- Corrected some fields in the still packet (guild emblem being stored as a Long when it should be Short)
- Modified most fields of view_data to be unsigned shorts rather than signed ones.
- On-Touch NPCs will now make you stop walking when you trigger them.
- Reduced stun duration of most skills to 3 secs.
- ShadowJump/JumpKick will make you land on the target's cell now.
- Fixed Kaahi triggering only once per skill duration.
- Added the kaahi_heal_timer to the list of status change functions.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6516 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 7c89545cb..7d9db7358 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -947,7 +947,6 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
 			if (sd->sc.option&6 ||

 				(!battle_config.duel_allow_teleport && sd->duel_group)) // duel rstrct [LuzZza]

 				break;

-			skill_stop_dancing(&sd->bl);

 			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;

 		case SCRIPT:

@@ -961,8 +960,10 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y)
 

 			sprintf(name,"%s::OnTouch", map[m].npc[i]->exname); // It goes here too. exname being the unique identifier. [Lance]

 

-			if( npc_event(sd,name,0)>0 )

+			if( npc_event(sd,name,0)>0 ) {

+				pc_stop_walking(sd,1); //Make it stop walking!

 				npc_click(sd,map[m].npc[i]->bl.id);

+			}

 			//aFree(name);

 			break;

 		}