From 523703b373a4723002974150fba981b38f185b0e Mon Sep 17 00:00:00 2001
From: drmDev <dmontur1@gmail.com>
Date: Sun, 26 Mar 2017 10:33:41 -0400
Subject: [PATCH] merge

---
 Mage.Sets/src/mage/cards/g/GameOfChaos.java | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/g/GameOfChaos.java b/Mage.Sets/src/mage/cards/g/GameOfChaos.java
index c5fe1e97ec..fad781efce 100644
--- a/Mage.Sets/src/mage/cards/g/GameOfChaos.java
+++ b/Mage.Sets/src/mage/cards/g/GameOfChaos.java
@@ -85,38 +85,36 @@ class GameOfChaosEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player you = game.getPlayer(source.getControllerId());
         Player targetOpponent = game.getPlayer(getTargetPointer().getFirst(game, source));
-        if (you != null && targetOpponent != null) {
-  
+        
+        if (you != null && targetOpponent != null) {  
             boolean continueFlipping = true;
             boolean youWinFlip = you.flipCoin(game); // controller flips first
-            boolean controllerWonLast = false;
+            boolean youWonLastFlip = false; // tracks if you won the flip last, negation of it means opponent won last
             int lifeAmount = 1; // starts with 1 life
                 
             while (continueFlipping) {
                 
                 if (youWinFlip) { // flipper of coin wins, flipper gain 1 and non-flipper loses 1
-                    you.gainLife(lifeAmount, game);
-                    targetOpponent.loseLife(lifeAmount, game, false);
+                    handleLifeChangesFromFlip(game, you, targetOpponent, lifeAmount);
                     if (targetOpponent.canRespond() && you.canRespond()) {
                         continueFlipping = you.chooseUse(outcome, "Flip again?", source, game);
-                        controllerWonLast = true;
+                        youWonLastFlip = true;
                     }
                 } else { // non-flipper wins, flipper lose 1 and non-flipper gains 1
-                    you.loseLife(lifeAmount, game, false);
-                    targetOpponent.gainLife(lifeAmount, game);
+                    handleLifeChangesFromFlip(game, targetOpponent, you, lifeAmount);
                     if (targetOpponent.canRespond() && you.canRespond()) {
                         continueFlipping = targetOpponent.chooseUse(outcome, "Flip again?", source, game);
-                        controllerWonLast = false;
+                        youWonLastFlip = false;
                     }
                 }
                 
-                if (!targetOpponent.canRespond() && !you.canRespond()) {
+                if (!targetOpponent.canRespond() || !you.canRespond()) {
                     continueFlipping = false;
                 }
                 
-                if (continueFlipping) {                    
+                if (continueFlipping) {
                     lifeAmount *= 2; // double the life each time
-                    if (controllerWonLast) {
+                    if (youWonLastFlip) {
                         youWinFlip = you.flipCoin(game);
                     } else {
                         youWinFlip = !targetOpponent.flipCoin(game); // negate the results for proper evaluation above
@@ -128,4 +126,9 @@ class GameOfChaosEffect extends OneShotEffect {
         }
         return false;
     }
+        
+    private void handleLifeChangesFromFlip(Game game, Player playerGainingLife, Player playerLosingLife, int lifeAmount) {        
+        playerGainingLife.gainLife(lifeAmount, game);
+        playerLosingLife.loseLife(lifeAmount, game, false);
+    }
 }
\ No newline at end of file