summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 14:53:05 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-12 14:53:05 +0000
commit78e1256b168a8d4403883079c8f6bb2687ae71aa (patch)
treee27203c358b6b9bbca337d6a5c5c30ad466abc4b /src
parent3c22178a361374357075722777b31690119a068e (diff)
downloadhercules-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
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c7
1 files changed, 7 insertions, 0 deletions
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;