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

Oops, I messed up the condition on my last commit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13845 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish
2009-06-05 08:40:26 +00:00
parent dc7f470790
commit ea6005e4bf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/skill.c
View File

@@ -5834,7 +5834,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
if (ud->walktimer != -1 && ud->skillid != TK_RUN)
unit_stop_walking(src,1);
if( sd->skillitem == ud->skillid && skill_get_delay(ud->skillid,ud->skilllv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_delay(ud->skillid,ud->skilllv) )
ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); //Tests show wings don't overwrite the delay but skill scrolls do. [Inkfish]
if( battle_config.display_status_timers && sd )
clif_status_change(src, SI_ACTIONDELAY, 1, skill_delayfix(src, ud->skillid, ud->skilllv));
@@ -5928,7 +5928,7 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
}
ud->skillid = ud->skilllv = ud->skilltarget = 0;
if( sd->skillitem == ud->skillid && skill_get_delay(ud->skillid,ud->skilllv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_delay(ud->skillid,ud->skilllv) )
ud->canact_tick = tick;
//You can't place a skill failed packet here because it would be
//sent in ALL cases, even cases where skill_check_condition fails
@@ -6046,7 +6046,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr data)
if (ud->walktimer != -1)
unit_stop_walking(src,1);
if( sd->skillitem == ud->skillid && skill_get_delay(ud->skillid,ud->skilllv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_delay(ud->skillid,ud->skilllv) )
ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
if( battle_config.display_status_timers && sd )
clif_status_change(src, SI_ACTIONDELAY, 1, skill_delayfix(src, ud->skillid, ud->skilllv));
@@ -6077,7 +6077,7 @@ int skill_castend_pos(int tid, unsigned int tick, int id, intptr data)
return 1;
} while(0);
if( sd->skillitem == ud->skillid && skill_get_delay(ud->skillid,ud->skilllv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_delay(ud->skillid,ud->skilllv) )
ud->canact_tick = tick;
ud->skillid = ud->skilllv = 0;
if(sd)

4
src/map/unit.c
View File

@@ -1074,7 +1074,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
if( casttime <= 0 )
ud->state.skillcastcancel = 0;
if( sd->skillitem == skill_num && skill_get_cast(skill_num,skill_lv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) )
ud->canact_tick = tick + casttime + 100;
if( sd )
{
@@ -1180,7 +1180,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh
casttime = skill_castfix_sc(src, casttime);
ud->state.skillcastcancel = castcancel&&casttime>0?1:0;
if( sd->skillitem == skill_num && skill_get_cast(skill_num,skill_lv) )
if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) )
ud->canact_tick = tick + casttime + 100;
// if( sd )
// {