* Some clean ups on autocast and itemskill code. (see topic:220921 for some info)

- Autocasted Teleport now skips the menu.
- Fixed nullpo info when defensive autocasts are triggered. (follow up to r13815)
- Fixed Warp portal used in item script never worked.
- Item skills now bypass skill delay check.
- Implemented SM_SELFPROVOKE. 
- Updated item db using 'itemskill' for some items.
* Basic skills will never be reset. 

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

1 files changed, 11 insertions, 5 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index d24007de9..ba774497c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9481,8 +9481,11 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 	}
 	else if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 )
 	{
-		clif_skill_fail(sd, skillnum, 4, 0);
-		return;
+		if( sd->skillitem != skillnum )
+		{
+			clif_skill_fail(sd, skillnum, 4, 0);
+			return;
+		}
 	}
 
 	if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER) )
@@ -9490,7 +9493,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 
 	if( sd->sc.data[SC_BASILICA] && (skillnum != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id) )
 		return; // On basilica only caster can use Basilica again to stop it.
-	
+
 	if( sd->menuskill_id )
 	{
 		if( sd->menuskill_id == SA_TAMINGMONSTER )
@@ -9604,8 +9607,11 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, short skil
 
 	if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 )
 	{
-		clif_skill_fail(sd, skillnum, 4, 0);
-		return;
+		if( sd->skillitem != skillnum )
+		{
+			clif_skill_fail(sd, skillnum, 4, 0);
+			return;
+		}
 	}
 
 	if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER) )