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

- Fixed NPEs in the new prompt input code (we should not assume that SA vars will be filled in at all times).

Browse Source
This commit is contained in:
Agetian
2017-01-21 19:20:46 +00:00
parent 001b6aea84
commit 828359c0bc
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui/src/main/java/forge/match/input/InputConfirm.java
View File

@@ -61,8 +61,8 @@ public class InputConfirm extends InputSyncronizedBase {
noButtonText = noButtonText0; noButtonText = noButtonText0;
defaultYes = defaultYes0; defaultYes = defaultYes0;
result = defaultYes0; result = defaultYes0;
this.sa = null; this.sa = null;
this.card = null; this.card = null;
} }
public InputConfirm(final PlayerControllerHuman controller, String message0, SpellAbility sa0) { public InputConfirm(final PlayerControllerHuman controller, String message0, SpellAbility sa0) {
@@ -80,8 +80,8 @@ public class InputConfirm extends InputSyncronizedBase {
noButtonText = noButtonText0; noButtonText = noButtonText0;
defaultYes = defaultYes0; defaultYes = defaultYes0;
result = defaultYes0; result = defaultYes0;
this.sa = sa0; this.sa = sa0;
this.card = sa.getView().getHostCard(); this.card = sa != null ? sa.getView().getHostCard() : null;
} }
public InputConfirm(final PlayerControllerHuman controller, String message0, CardView card0) { public InputConfirm(final PlayerControllerHuman controller, String message0, CardView card0) {
@@ -99,8 +99,8 @@ public class InputConfirm extends InputSyncronizedBase {
noButtonText = noButtonText0; noButtonText = noButtonText0;
defaultYes = defaultYes0; defaultYes = defaultYes0;
result = defaultYes0; result = defaultYes0;
this.sa = null ; this.sa = null ;
this.card = card0; this.card = card0;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */

4
forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java
View File

@@ -36,7 +36,9 @@ public abstract class InputSelectManyBase<T extends GameEntity> extends InputSyn
protected InputSelectManyBase(final PlayerControllerHuman controller, final int min, final int max, final SpellAbility sa0) { protected InputSelectManyBase(final PlayerControllerHuman controller, final int min, final int max, final SpellAbility sa0) {
this(controller,min,max); this(controller,min,max);
this.sa = sa0; this.sa = sa0;
this.card = sa0.getView().getHostCard(); if (sa0 != null) {
this.card = sa0.getView().getHostCard();
}
} }
protected InputSelectManyBase(final PlayerControllerHuman controller, final int min, final int max, final CardView card0) { protected InputSelectManyBase(final PlayerControllerHuman controller, final int min, final int max, final CardView card0) {

6
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1031,9 +1031,9 @@ public class PlayerControllerHuman
default: labels = ImmutableList.copyOf(kindOfChoice.toString().split("Or")); default: labels = ImmutableList.copyOf(kindOfChoice.toString().split("Or"));
} }
// return getGui().confirm(CardView.get(sa.getHostCard()), question, defaultVal == null || defaultVal.booleanValue(), labels); // return getGui().confirm(CardView.get(sa.getHostCard()), question, defaultVal == null || defaultVal.booleanValue(), labels);
final InputConfirm inp = new InputConfirm(this, question, labels.get(0), labels.get(1), defaultVal == null || defaultVal.booleanValue(), sa); final InputConfirm inp = new InputConfirm(this, question, labels.get(0), labels.get(1), defaultVal == null || defaultVal.booleanValue(), sa);
inp.showAndWait(); inp.showAndWait();
return inp.getResult(); return inp.getResult();
} }
@Override @Override