From 488ed9ee00c4755baa1c5351d0e708993f9275f1 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 28 Apr 2019 11:12:39 +0400 Subject: [PATCH] * Melee - fixed that it don't triggers on unblocked attacks and don't untap it; --- Mage/src/main/java/mage/game/combat/Combat.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 990147a7830..d8d9f619b25 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -555,7 +555,8 @@ public class Combat implements Serializable, Copyable { } for (UUID attackingCreatureID : game.getCombat().getAttackers()) { Permanent permanent = game.getPermanent(attackingCreatureID); - if (permanent != null && permanent.getBlocking() == 0) { + CombatGroup group = game.getCombat().findGroup(attackingCreatureID); + if (permanent != null && group != null && !group.getBlocked()) { game.fireEvent(GameEvent.getEvent(EventType.UNBLOCKED_ATTACKER, attackingCreatureID, attackingPlayerId)); } }