Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Odric Master Tactician - Fixed that the game didn't leave the block phase controlled by the controller of Odric.

Browse source
This commit is contained in:
LevelX2 2013-08-06 18:26:49 +02:00
parent 1a81c42441
commit 0d37d1593b
14 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/players/PlayerImpl.java
View file

@ -1390,10 +1390,10 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
}
@Override
public void declareBlocker(UUID blockerId, UUID attackerId, Game game) {
public void declareBlocker(UUID defenderId, UUID blockerId, UUID attackerId, Game game) {
Permanent blocker = game.getPermanent(blockerId);
CombatGroup group = game.getCombat().findGroup(attackerId);
if (blocker != null && group != null && group.canBlock(blocker, game) && blocker.getControllerId().equals(playerId)) {
if (blocker != null && group != null && group.canBlock(blocker, game) && blocker.getControllerId().equals(defenderId)) {
group.addBlocker(blockerId, playerId, game);
game.getCombat().addBlockingGroup(blockerId, attackerId, playerId, game);
}