Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed NPE in TurnMods (fixes #296).

Browse source
This commit is contained in:
LevelX2 2013-07-25 15:52:20 +02:00
parent 1d6ee80e4c
commit 271e4b61ba
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/mage/game/turn/TurnMods.java
View file

@ -107,12 +107,19 @@ public class TurnMods extends ArrayList<TurnMod> {
}
public boolean skipStep(UUID playerId, PhaseStep step) {
ListIterator<TurnMod> it = this.listIterator(this.size());
while (it.hasPrevious()) {
TurnMod turnMod = it.previous();
if (turnMod.getSkipStep() != null && turnMod.getPlayerId().equals(playerId) && turnMod.getSkipStep() == step) {
it.remove();
return true;
if (step != null) {
ListIterator<TurnMod> it = this.listIterator(this.size());
while (it.hasPrevious()) {
TurnMod turnMod = it.previous();
if (turnMod.getSkipStep() != null) {
if (turnMod.getPlayerId().equals(playerId)) {
if (turnMod.getSkipStep() == step) {
it.remove();
return true;
}
}
}
}
}
return false;