Fixed bugreport:6151 monster skills will only trigger their text messages if they're successful, special thanks/credits to Daegaladh

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16366 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 10 insertions, 12 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index 0ae9d6664..7d02bbc27 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3143,16 +3143,6 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
 		
 		if (!flag)
 			continue; //Skill requisite failed to be fulfilled.
-
-		if (ms[i].msg_id){ //Display color message [SnakeDrak]
-			struct mob_chat *mc = mob_chat(ms[i].msg_id);
-			char temp[CHAT_SIZE_MAX];
- 			char name[NAME_LENGTH];
- 			snprintf(name, sizeof name,"%s", md->name);
- 			strtok(name, "#"); // discard extra name identifier if present [Daegaladh]
- 			snprintf(temp, sizeof temp,"%s : %s", name, mc->msg);
-			clif_messagecolor(&md->bl, mc->color, temp);
-		}
 		
 		//Execute skill
 		if (skill_get_casttype(ms[i].skill_id) == CAST_GROUND)
@@ -3242,8 +3232,16 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
 			}
 		}
 		//Skill used. Post-setups... 
-		if(!(battle_config.mob_ai&0x200))
-		{ //pass on delay to same skill.
+		if ( ms[ i ].msg_id ){ //Display color message [SnakeDrak]
+			struct mob_chat *mc = mob_chat(ms[i].msg_id);
+			char temp[CHAT_SIZE_MAX];
+ 			char name[NAME_LENGTH];
+ 			snprintf(name, sizeof name,"%s", md->name);
+ 			strtok(name, "#"); // discard extra name identifier if present [Daegaladh]
+ 			snprintf(temp, sizeof temp,"%s : %s", name, mc->msg);
+			clif_messagecolor(&md->bl, mc->color, temp);
+		}
+		if(!(battle_config.mob_ai&0x200)) { //pass on delay to same skill.
 			for (j = 0; j < md->db->maxskill; j++)
 				if (md->db->skill[j].skill_id == ms[i].skill_id)
 					md->skilldelay[j]=tick;