diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 21:34:12 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-16 21:34:12 +0000 |
| commit | b069fc249c86084dd87c13109058b78f2b8e8159 (patch) | |
| tree | 2c5e62f534f891d791213c2538a217f6df2fb173 | |
| parent | f2cd09b51583177a2ef74c3b52f58986b13bedf3 (diff) | |
| download | hercules-b069fc249c86084dd87c13109058b78f2b8e8159.tar.gz hercules-b069fc249c86084dd87c13109058b78f2b8e8159.tar.bz2 hercules-b069fc249c86084dd87c13109058b78f2b8e8159.tar.xz hercules-b069fc249c86084dd87c13109058b78f2b8e8159.zip | |
- @kill_monster/@kill_monster2 won't touch Guardians/Emperium now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5631 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ea6451c63..5de86d1e9 100644 --- a/Changelog-Trunk.txt +++ b/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]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index dad90776f..c6b83011b 100644 --- a/src/map/atcommand.c +++ b/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,
|