External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172)

Browse source
This commit is contained in:
Zzooouhh 2017-12-26 22:29:54 +01:00 • committed by GitHub
parent 8228cee30c
commit 3de6f417dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1421,6 +1421,19 @@ public class Combat implements Serializable, Copyable<Combat> {
}
}
}
boolean canRemove = false;
for (CombatGroup group : getBlockingGroups()) {
if (group.blockers.contains(blockerId)) {
group.blockers.remove(blockerId);
group.attackerOrder.clear();
}
if (group.blockers.isEmpty()) {
canRemove = true;
}
}
if (canRemove) {
blockingGroups.remove(blockerId);
}
Permanent creature = game.getPermanent(blockerId);
if (creature != null) {
creature.setBlocking(0);