Jelajahi Sumber

- @kill_monster/@kill_monster2 won't touch Guardians/Emperium now.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5631 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 tahun lalu
induk
melakukan
6010f9a74c
2 mengubah file dengan 5 tambahan dan 1 penghapusan
  1. 1 0
      Changelog-Trunk.txt
  2. 4 1
      src/map/atcommand.c

+ 1 - 0
Changelog-Trunk.txt

@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/16
+	* @kill_monster/@kill_monster2 won't touch Guardians/Emperium now. [Skotlex]
 	* Small change in the random item reading function, may fix @itemdbreload
 	  messing up random item searches. [Skotlex]
 	* Restricted GS_BULLSEYE to only be used on demi-human or brute monster targets [MasterOfMuppets]

+ 4 - 1
src/map/atcommand.c

@@ -3633,12 +3633,15 @@ static int atkillmonster_sub(struct block_list *bl, va_list ap) {
 	nullpo_retr(0, md=(struct mob_data *)bl);
 	flag = va_arg(ap, int);
 
+	if (md->guardian_data)
+		return 0; //Do not touch WoE mobs!
+	
 	if (flag)
 		mob_damage(NULL, md, md->hp, 2);
 	else
 		mob_delete(md);
 	
-	return 0;
+	return 1;
 }
 void atcommand_killmonster_sub(
 	const int fd, struct map_session_data* sd, const char* message,