Merge branch 'master' into 'master'

Fixed a regression which made it impossible to select lands under tapped lands…

See merge request core-developers/forge!1205
This commit is contained in:
Michael Kamensky
2018-12-10 05:36:55 +00:00

View File

@@ -6,6 +6,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import forge.GuiBase;
import forge.game.GameActionUtil;
import forge.game.spellability.SpellAbilityView;
import forge.util.TextUtil;
@@ -71,6 +72,24 @@ public abstract class InputPayMana extends InputSyncronizedBase {
@Override
protected boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) {
if (GuiBase.getInterface().isLibgdxPort()) {
// Mobile Forge allows to tap cards underneath the current card even if the current one is tapped
if (otherCardsToSelect != null) {
for (Card c : otherCardsToSelect) {
for (SpellAbility sa : c.getManaAbilities()) {
if (sa.canPlay()) {
delaySelectCards.add(c);
break;
}
}
}
}
if (!card.getManaAbilities().isEmpty() && activateManaAbility(card)) {
return true;
}
return activateDelayedCard();
} else {
// Desktop Forge floating menu functionality
if (card.getManaAbilities().size() == 1) {
activateManaAbility(card, card.getManaAbilities().get(0));
} else {
@@ -87,6 +106,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
}
return true;
}
}
@Override
public String getActivateAction(Card card) {