Index: pc.c =================================================================== --- pc.c (revision 16964) +++ pc.c (working copy) @@ -4187,23 +4187,7 @@ if (nameid != ITEMID_NAUTHIZ && sd->sc.opt1 > 0 && sd->sc.opt1 != OPT1_STONEWAIT && sd->sc.opt1 != OPT1_BURNING) return 0; - if( sd->sc.count){ - if((nameid == ITEMID_NAUTHIZ) && ( //bugreport 6751 - sd->sc.data[SC_FREEZE] || - sd->sc.data[SC_STUN] || - sd->sc.data[SC_DEEPSLEEP] || - sd->sc.data[SC_STONE] || - sd->sc.data[SC_CRYSTALIZE] - ) - ){ - sd->sc.opt1 = 0; //remove option and status to allow skill - status_change_end(&sd->bl,SC_FREEZE,INVALID_TIMER); - status_change_end(&sd->bl,SC_STUN,INVALID_TIMER); - status_change_end(&sd->bl,SC_DEEPSLEEP,INVALID_TIMER); - status_change_end(&sd->bl,SC_STONE,INVALID_TIMER); - status_change_end(&sd->bl,SC_CRYSTALIZE,INVALID_TIMER); - } //let us continue - else if( + if( sd->sc.count && ( sd->sc.data[SC_BERSERK] || sd->sc.data[SC__BLOODYLUST] || (sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) || sd->sc.data[SC_TRICKDEAD] || @@ -4211,10 +4195,9 @@ sd->sc.data[SC__SHADOWFORM] || sd->sc.data[SC__MANHOLE] || sd->sc.data[SC_KAGEHUMI] || - (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) - ) + (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM && nameid != ITEMID_NAUTHIZ) + )) return 0; - } //Prevent mass item usage. [Skotlex] if( DIFF_TICK(sd->canuseitem_tick, tick) > 0 || @@ -4301,6 +4284,9 @@ sd->canuseitem_tick = tick + battle_config.item_use_interval; if( itemdb_iscashfood(nameid) ) sd->canusecashfood_tick = tick + battle_config.cashfood_use_interval; + + if(nameid == ITEMID_NAUTHIZ && rk_refresh_cooldown <= 0) //bugreport 6751 + sd->sc.opt1 = 0; //remove option and status to allow skill run_script(script,0,sd->bl.id,fake_nd->bl.id); potion_flag = 0;