External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 13:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Melee - fixed that it don't triggers on unblocked attacks and don't untap it;

Browse source
This commit is contained in:
Oleg Agafonov 2019-04-28 11:12:39 +04:00
parent dc04092fce
commit 488ed9ee00
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -555,7 +555,8 @@ public class Combat implements Serializable, Copyable<Combat> {
}
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));
}
}