@@ -2524,8 +2524,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
sc_start(src,src,SC_SMA,100,skill_lv,skill_get_time(SL_SMA, skill_lv));
break;
case GS_FULLBUSTER:
- //Can't attack nor use items until skill's delay expires. [Skotlex]
- sd->ud.attackabletime = sd->canuseitem_tick = sd->ud.canact_tick;
+ if(sd) //Can't attack nor use items until skill's delay expires. [Skotlex]
+ sd->ud.attackabletime = sd->canuseitem_tick = sd->ud.canact_tick;
}
@@ -1806,9 +1806,9 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
int status_base_amotion_pc(struct map_session_data* sd, struct status_data* status)
{
int amotion;
+ int classidx = pc_class2idx(sd->status.class_);
#ifdef RENEWAL_ASPD
short mod = -1;
- int classidx = pc_class2idx(sd->status.class_);
switch( sd->weapontype2 ){ // adjustment for dual weilding
case W_DAGGER: mod = 0; break; // 0, 1, 1