summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c10
2 files changed, 12 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2a68cd1de..ba842f769 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,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/17
+ * Monocell, Instant Death and Class Change will now fail on bosses (bugreport:2907) [Playtester]
09/05/15
* AutoSpellWhenHit now triggers on normal+skill by default (bugreport:1652) [Playtester]
* Removed the undocumented custom level feature from monster spawn lines (bugreport:3076) [ultramage]
diff --git a/src/map/skill.c b/src/map/skill.c
index cc3c034dc..9f7ec7b15 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3320,6 +3320,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case SA_MONOCELL:
if (dstmd)
{
+ if ( dstmd->status.mode&MD_BOSS )
+ {
+ clif_skill_fail(sd,skillid,0,0);
+ break;
+ }
int class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(2, 1, 0);
clif_skill_nodamage(src,bl,skillid,skilllv,1);
mob_class_change(dstmd,class_);
@@ -3334,6 +3339,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}
break;
case SA_DEATH:
+ if ( dstmd && dstmd->status.mode&MD_BOSS )
+ {
+ clif_skill_fail(sd,skillid,0,0);
+ break;
+ }
clif_skill_nodamage(src,bl,skillid,skilllv,1);
status_kill(bl);
break;