diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-12 14:53:05 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-12 14:53:05 +0000 |
| commit | 78e1256b168a8d4403883079c8f6bb2687ae71aa (patch) | |
| tree | e27203c358b6b9bbca337d6a5c5c30ad466abc4b | |
| parent | 3c22178a361374357075722777b31690119a068e (diff) | |
| download | hercules-78e1256b168a8d4403883079c8f6bb2687ae71aa.tar.gz hercules-78e1256b168a8d4403883079c8f6bb2687ae71aa.tar.bz2 hercules-78e1256b168a8d4403883079c8f6bb2687ae71aa.tar.xz hercules-78e1256b168a8d4403883079c8f6bb2687ae71aa.zip | |
* Fixed Aid Potion can heal the Emperium (bugreport:164)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13759 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2042ea1f2..4aada0be7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -2,6 +2,8 @@ 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/05/12 + * Fixed Aid Potion can heal the Emperium (bugreport:164) [Inkfish] 09/05/11 * Fixed a crash when mob uses self-destruct skill (bugreport:2874) [Inkfish] 09/05/10 diff --git a/src/map/skill.c b/src/map/skill.c index 239db16e4..767bb7833 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4370,6 +4370,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case AM_POTIONPITCHER: { int i,x,hp = 0,sp = 0,bonus=100; + if( dstmd && dstmd->class_ == MOBID_EMPERIUM ) + { + map_freeblock_unlock(); + return 1; + } if( sd ) { x = skilllv%11 - 1; @@ -5083,6 +5088,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 ) + break; if (potion_hp || potion_sp) { int hp = potion_hp, sp = potion_sp; hp = hp * (100 + (tstatus->vit<<1))/100; |