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

Minor null pointer fix in InputControl.

Browse Source
This commit is contained in:
Doublestrike
2011-11-12 00:07:19 +00:00
parent bf9c24447f
commit 71196cd4cd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/gui/input/InputControl.java
View File

@@ -223,8 +223,10 @@ public class InputControl extends MyObservable implements java.io.Serializable {
// ********************* // *********************
// Special phases handled above, everything else is handled simply by // Special phases handled above, everything else is handled simply by
// priority // priority
if (priority == null) {
if (priority.isHuman()) { return null;
}
else if (priority.isHuman()) {
final boolean skip = this.model.getGameState().getPhase().doSkipPhase(); final boolean skip = this.model.getGameState().getPhase().doSkipPhase();
this.model.getGameState().getPhase().setSkipPhase(false); this.model.getGameState().getPhase().setSkipPhase(false);
if ((this.model.getGameState().getStack().size() == 0) if ((this.model.getGameState().getStack().size() == 0)
@@ -234,9 +236,11 @@ public class InputControl extends MyObservable implements java.io.Serializable {
} else { } else {
return new InputPassPriority(); return new InputPassPriority();
} }
} else if (playerTurn.isComputer()) { }
else if (playerTurn.isComputer()) {
return this.aiInput; return this.aiInput;
} else { }
else {
this.aiInput.getComputer().stackNotEmpty(); this.aiInput.getComputer().stackNotEmpty();
return null; return null;
} }