- Fix for r19720.

This commit is contained in:
Sloth
2013-02-18 21:33:09 +00:00
parent c0586e1479
commit 0f446a0752
2 changed files with 12 additions and 12 deletions

View File

@@ -16,18 +16,7 @@ public abstract class SpellAiLogic {
return false;
}
final AbilitySub subAb = sa.getSubAbility();
if (subAb != null && !chkAIDrawbackWithSubs(aiPlayer, subAb)) {
return false;
}
return true;
}
public final boolean chkAIDrawbackWithSubs(final AIPlayer aiPlayer, final SpellAbility sa) {
if (!chkAIDrawback(sa, aiPlayer)) {
return false;
}
final AbilitySub subAb = sa.getSubAbility();
if (subAb != null && !chkAIDrawbackWithSubs(aiPlayer, subAb)) {
if (subAb != null && !subAb.chkAIDrawbackWithSubs(aiPlayer)) {
return false;
}
return true;

View File

@@ -65,6 +65,17 @@ public abstract class AbilitySub extends SpellAbility implements java.io.Seriali
* @return a boolean.
*/
public abstract boolean chkAIDrawback(AIPlayer ai);
public final boolean chkAIDrawbackWithSubs(final AIPlayer aiPlayer) {
if (!chkAIDrawback(aiPlayer)) {
return false;
}
final AbilitySub subAb = this.getSubAbility();
if (subAb != null && !subAb.chkAIDrawbackWithSubs(aiPlayer)) {
return false;
}
return true;
}
public abstract AbilitySub getCopy();