external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash when declaring attackers/blockers

Browse Source
This commit is contained in:
drdev
2014-04-12 08:31:31 +00:00
parent fdd81ef263
commit c6cc0ab964
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/match/input/InputAttack.java
View File

@@ -123,7 +123,7 @@ public class InputAttack extends InputSyncronizedBase {
@Override
protected final void onCardSelected(final Card card, final MouseEvent triggerEvent) {
final List<Card> att = combat.getAttackers();
if (triggerEvent.getButton() == 3 && att.contains(card) && !card.hasKeyword("CARDNAME attacks each turn if able.")
if (triggerEvent != null && triggerEvent.getButton() == 3 && att.contains(card) && !card.hasKeyword("CARDNAME attacks each turn if able.")
&& !card.hasStartOfKeyword("CARDNAME attacks specific player each combat if able")) {
// TODO Is there no way to attacks each turn cards to attack Planeswalkers?
combat.removeFromCombat(card);

2
forge-gui/src/main/java/forge/match/input/InputBlock.java
View File

@@ -99,7 +99,7 @@ public class InputBlock extends InputSyncronizedBase {
/** {@inheritDoc} */
@Override
public final void onCardSelected(final Card card, final MouseEvent triggerEvent) {
if (triggerEvent.getButton() == 3 && card.getController() == defender) {
if (triggerEvent != null && triggerEvent.getButton() == 3 && card.getController() == defender) {
combat.removeFromCombat(card);
GuiBase.getInterface().fireEvent(new UiEventBlockerAssigned(card, (Card)null));
} else {