Pārlūkot izejas kodu

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13759 54d463be-8e91-2dee-dedb-b68131a5f0ec
Inkfish 16 gadi atpakaļ
vecāks
revīzija
3f0559ebca
2 mainītis faili ar 9 papildinājumiem un 0 dzēšanām
  1. 2 0
      Changelog-Trunk.txt
  2. 7 0
      src/map/skill.c

+ 2 - 0
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

+ 7 - 0
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;