From 22e41df8eafffa44ef043057bd892da7bf8f19b6 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 6 Aug 2017 18:03:45 +0000 Subject: [PATCH] - Fixed a NPE in HostedMatch. --- forge-gui/src/main/java/forge/match/HostedMatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/match/HostedMatch.java b/forge-gui/src/main/java/forge/match/HostedMatch.java index 4af16c1e573..2471af0b3be 100644 --- a/forge-gui/src/main/java/forge/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/match/HostedMatch.java @@ -293,7 +293,7 @@ public class HostedMatch { for (final PlayerControllerHuman humanController : humanControllers) { humanController.getGui().updateSingleCard(event.blocker); final PlayerView p = humanController.getPlayer().getView(); - if (event.attackerBeingBlocked.getController().equals(p)) { + if (event.attackerBeingBlocked != null && event.attackerBeingBlocked.getController().equals(p)) { humanController.getGui().autoPassCancel(p); } }