Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed Aid Potion can heal the Emperium (bugreport:164)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13759 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish 2009-05-12 14:53:05 +00:00
parent acdd90f4aa
commit 3f0559ebca
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -2,6 +2,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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. 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 09/05/11
* Fixed a crash when mob uses self-destruct skill (bugreport:2874) [Inkfish] * Fixed a crash when mob uses self-destruct skill (bugreport:2874) [Inkfish]
09/05/10 09/05/10

7
src/map/skill.c
View File

@ -4370,6 +4370,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case AM_POTIONPITCHER: case AM_POTIONPITCHER:
{ {
int i,x,hp = 0,sp = 0,bonus=100; int i,x,hp = 0,sp = 0,bonus=100;
if( dstmd && dstmd->class_ == MOBID_EMPERIUM )
{
map_freeblock_unlock();
return 1;
}
if( sd ) if( sd )
{ {
x = skilllv%11 - 1; x = skilllv%11 - 1;
@ -5083,6 +5088,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
// Slim Pitcher // Slim Pitcher
case CR_SLIMPITCHER: case CR_SLIMPITCHER:
if( dstmd && dstmd->class_ == MOBID_EMPERIUM )
break;
if (potion_hp || potion_sp) { if (potion_hp || potion_sp) {
int hp = potion_hp, sp = potion_sp; int hp = potion_hp, sp = potion_sp;
hp = hp * (100 + (tstatus->vit<<1))/100; hp = hp * (100 + (tstatus->vit<<1))/100;