diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/map.h | 5 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0abb2c480..af50d2014 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/11/01 + * Rev. 14115 Implemented the fix for Slim Pitcher working on WoESE objects (bugreport:3618). [L0ne_W0lf] + * Added SC_SPIRIT to the list of buffs that are dispelled when the player logs out. 09/10/27 * Fixed quest will never get erased when it's the only quest you have. [Inkfish] * Cast time of Emergency Call is doubled if you master of High Jump. [Inkfish] diff --git a/src/map/map.c b/src/map/map.c index 203a31733..8a845c4be 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1638,6 +1638,8 @@ int map_quit(struct map_session_data *sd) status_change_end(&sd->bl,SC_PRESERVE,-1); if(sd->sc.data[SC_KAAHI]) status_change_end(&sd->bl,SC_KAAHI,-1); + if(sd->sc.data[SC_SPIRIT]) + status_change_end(&sd->bl,SC_SPIRIT,-1); } } diff --git a/src/map/map.h b/src/map/map.h index 5fc6739a1..d76b7fabe 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -45,6 +45,11 @@ struct item_data; #define MAX_IGNORE_LIST 20 // official is 14 #define MAX_VENDING 12 #define MOBID_EMPERIUM 1288 +// Added definitions for WoESE objects. [L0ne_W0lf] +#define MOBID_BARRICADE1 1905 +#define MOBID_BARRICADE2 1906 +#define MOBID_GUARIDAN_STONE1 1907 +#define MOBID_GUARIDAN_STONE2 1908 //The following system marks a different job ID system used by the map server, //which makes a lot more sense than the normal one. [Skotlex] diff --git a/src/map/skill.c b/src/map/skill.c index 008ea2284..7b995399d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5255,7 +5255,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in // Slim Pitcher case CR_SLIMPITCHER: - if( dstmd && dstmd->class_ == MOBID_EMPERIUM ) + // Updated to block Slim Pitcher from working on barricades and guardian stones. + if( ( dstmd && dstmd->class_ == MOBID_EMPERIUM ) || ( dstmd && dstmd->class_ >= MOBID_BARRICADE1 && dstmd && dstmd->class_ <= MOBID_GUARIDAN_STONE2 ) ) break; if (potion_hp || potion_sp) { int hp = potion_hp, sp = potion_sp; |