From 01b10f28754eeb3c24f1543496a1bec40be96c18 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sat, 8 Oct 2016 16:11:04 +0000
Subject: [PATCH] - Properly consider Trample damage for non-pumped blocked
 creatures in the previously committed routine.

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCard.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index e0c50290ad8..23893cc8ac2 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -1202,9 +1202,15 @@ public class ComputerUtilCard {
                             continue;
                         }
                         if (atk == c) {
-                            totalPowerUnblocked += pumpedDmg;
+                            totalPowerUnblocked += pumpedDmg; // this accounts for Trample by now
                         } else {
                             totalPowerUnblocked += ComputerUtilCombat.damageIfUnblocked(atk, opp, combat, true);
+                            if (combat.isBlocked(atk)) {
+                                // consider Trample damage properly for a blocked creature
+                                for (Card blk : combat.getBlockers(atk)) {
+                                    totalPowerUnblocked -= ComputerUtilCombat.getDamageToKill(blk);
+                                }
+                            }
                         }
                     }
                     if (totalPowerUnblocked >= opp.getLife()){