Fixing charge bug when enemy doesn't have melee attacks

tukkek · Oct 18, 2017 · 6d613cd · 6d613cd
1 parent 50f7107
commit 6d613cd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/javelin/controller/action/Charge.java b/javelin/controller/action/Charge.java
@@ -67,7 +67,8 @@ protected void attack(final Combatant combatant,
 	ArrayList<List<ChanceNode>> charge(BattleState state, Combatant me,
 			Combatant target) {
 		final ArrayList<List<ChanceNode>> chances = new ArrayList<List<ChanceNode>>();
-		if (me.hascondition(Fatigued.class) != null) {
+		if (me.source.melee.isEmpty()
+				|| me.hascondition(Fatigued.class) != null) {
 			return chances;
 		}
 		Point from = new Point(me.location[0], me.location[1]);