External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 19:59:54 -08:00
Code Issues Projects Releases Packages Wiki 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

6
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -621,7 +621,7 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
Permanent blocker = game.getPermanent(response.getUUID());
if (blocker != null) {
if (filter.match(blocker, null, playerId, game)) {
selectCombatGroup(blocker.getId(), game);
selectCombatGroup(defendingPlayerId, blocker.getId(), game);
}
else if (filterBlock.match(blocker, null, playerId, game) && game.getStack().isEmpty()) {
game.getCombat().removeBlocker(blocker.getId(), game);
@ -666,7 +666,7 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
return null;
}
protected void selectCombatGroup(UUID blockerId, Game game) {
protected void selectCombatGroup(UUID defenderId, UUID blockerId, Game game) {
updateGameStatePriority("selectCombatGroup", game);
TargetAttackingCreature target = new TargetAttackingCreature();
game.fireSelectTargetEvent(playerId, "Select attacker to block", target.possibleTargets(null, playerId, game), target.isRequired(), null);
@ -674,7 +674,7 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
if (response.getBoolean() != null) {
// do nothing
} else if (response.getUUID() != null) {
declareBlocker(blockerId, response.getUUID(), game);
declareBlocker(defenderId, blockerId, response.getUUID(), game);
}
}