From 3da3d1c8754c808f6b94b874fcfc67c8beea0c07 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 28 Sep 2013 12:02:33 +0200 Subject: [PATCH] Fixed possible NPE in TurnMods.skipStep. --- Mage/src/mage/game/turn/TurnMods.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/mage/game/turn/TurnMods.java b/Mage/src/mage/game/turn/TurnMods.java index 2efe7bc6832..18e0d84134c 100644 --- a/Mage/src/mage/game/turn/TurnMods.java +++ b/Mage/src/mage/game/turn/TurnMods.java @@ -112,7 +112,7 @@ public class TurnMods extends ArrayList { while (it.hasPrevious()) { TurnMod turnMod = it.previous(); if (turnMod.getSkipStep() != null) { - if (turnMod.getPlayerId().equals(playerId)) { + if (turnMod.getPlayerId() != null && turnMod.getPlayerId().equals(playerId)) { if (turnMod.getSkipStep() == step) { it.remove(); return true;