Corrected Tiger Cannon combo bonus (fixes #1233)

* Tiger Cannon combo bonus should not be applied when used through Flash Combo. * Follow up to e30df46.
rathena · May 2, 2016 · cb52138 · cb52138
1 parent 1967fab
commit cb52138
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/map/skill.c b/src/map/skill.c
@@ -5537,8 +5537,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
 		} else if (sd) {
 			skill_area_temp[1] = bl->id;
 			skill_area_temp[3] = skill_id;
-			if (sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE)
-				flag |= 8;
+			if (sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE && !sc->data[SC_FLASHCOMBO])
+				flag |= 8; // Only apply Combo bonus when Tiger Cannon is not used through Flash Combo
 			skill_attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
 			map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR|BL_SKILL, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|1, skill_castend_damage_id);
 		}