From b25d3bb6737d31497c6b395fa5907d1d3e84df72 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 26 Apr 2013 20:36:33 +0000
Subject: [PATCH] - Fixed attackingPlayer sometimes not being set.

---
 src/main/java/forge/game/phase/Combat.java    | 2 +-
 src/main/java/forge/game/phase/PhaseUtil.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/forge/game/phase/Combat.java b/src/main/java/forge/game/phase/Combat.java
index 8864d4f021c..25eecaa8668 100644
--- a/src/main/java/forge/game/phase/Combat.java
+++ b/src/main/java/forge/game/phase/Combat.java
@@ -84,7 +84,7 @@ public class Combat {
         this.unblocked.clear();
         this.defendingDamageMap.clear();
 
-        this.attackingPlayer = null;
+        this.attackingPlayer = playerTurn;
 
         this.initiatePossibleDefenders(playerTurn.getOpponents());
     }
diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java
index 16e557f6166..360d0470e43 100644
--- a/src/main/java/forge/game/phase/PhaseUtil.java
+++ b/src/main/java/forge/game/phase/PhaseUtil.java
@@ -89,7 +89,6 @@ public class PhaseUtil {
         CMessage.SINGLETON_INSTANCE.updateGameInfo(Singletons.getModel().getMatch());
 
         game.getCombat().reset(turn);
-        game.getCombat().setAttackingPlayer(turn);
 
         // Tokens starting game in play should suffer from Sum. Sickness
         final List<Card> list = turn.getCardsIncludePhasingIn(ZoneType.Battlefield);