diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/pc.c | 3 | ||||
| -rw-r--r-- | src/map/status.c | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f0c7259d9..8a73f96cc 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +09/06/12 + * Fixed itemskill not bypassing Silence, SteelBody, Berserk and the like. (bugreport:3232) [Inkfish] + * Fury and Asura no longer disable SP regen on any other classes than Monk/Champion.(bugreport:3200) [Inkfish] 09/06/11 * Fixed TaTaMiGaEShi(Improvised Defense) not working. [Inkfish] * Implemented new cooking success formula. Now cooking experience starts at 0.(bugreport:2439) [Inkfish] diff --git a/src/map/pc.c b/src/map/pc.c index abb86f95d..a53a3a7fe 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3479,7 +3479,8 @@ int pc_useitem(struct map_session_data *sd,int n) //Since most delay-consume items involve using a "skill-type" target cursor, //perform a skill-use check before going through. [Skotlex] //resurrection was picked as testing skill, as a non-offensive, generic skill, it will do. - if( sd->inventory_data[n]->flag.delay_consume && ( sd->ud.skilltimer != -1 || !status_check_skilluse(&sd->bl, &sd->bl, ALL_RESURRECTION, 0) ) ) + //FIXME: Is this really needed here? It'll be checked in unit.c after all and this prevents skill items using when silenced [Inkfish] + if( sd->inventory_data[n]->flag.delay_consume && ( sd->ud.skilltimer != -1 /*|| !status_check_skilluse(&sd->bl, &sd->bl, ALL_RESURRECTION, 0)*/ ) ) return 0; sd->itemid = sd->status.inventory[n].nameid; diff --git a/src/map/status.c b/src/map/status.c index b3433728c..f9db3f9c6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2644,10 +2644,11 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str regen->flag = 0; if ( - sc->data[SC_EXTREMITYFIST] - || sc->data[SC_DANCING] - || (sc->data[SC_EXPLOSIONSPIRITS] - && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK)) + sc->data[SC_DANCING] + || ( + (((TBL_PC*)bl)->class_&MAPID_UPPERMASK) == MAPID_MONK && + (sc->data[SC_EXTREMITYFIST] || (sc->data[SC_EXPLOSIONSPIRITS] && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK))) + ) ) //No natural SP regen regen->flag &=~RGN_SP; |