From 6b22afd18ac4b5c978720e686a0feb6f97bb07ce Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 10 Jun 2018 21:58:35 +0200 Subject: [PATCH] GameState: Reduced null pointer exception probablity for getTriggered. --- Mage/src/main/java/mage/game/GameState.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/game/GameState.java b/Mage/src/main/java/mage/game/GameState.java index f4516516fa2..e18fc41b72f 100644 --- a/Mage/src/main/java/mage/game/GameState.java +++ b/Mage/src/main/java/mage/game/GameState.java @@ -1,4 +1,3 @@ - package mage.game; import java.io.Serializable; @@ -911,7 +910,7 @@ public class GameState implements Serializable, Copyable { } public List getTriggered(UUID controllerId) { - return triggered.stream().filter(triggeredAbility -> triggeredAbility.getControllerId().equals(controllerId)) + return triggered.stream().filter(triggeredAbility -> controllerId.equals(triggeredAbility.getControllerId())) .collect(Collectors.toList()); }