mirror of
https://github.com/correl/mage.git
synced 2025-03-16 09:16:26 -09:00
* Master of Cruelties - Fixed that it worked correctly if put attacking onto battlefield by effect (e.g. Kaalia of the Vast ) during combat.
This commit is contained in:
parent
63b8890287
commit
ebd3c4ba89
1 changed files with 4 additions and 9 deletions
|
@ -109,23 +109,22 @@ class MasterOfCrueltiesTriggeredAbility extends TriggeredAbilityImpl<MasterOfCru
|
||||||
Permanent sourcePermanent = game.getPermanent(getSourceId());
|
Permanent sourcePermanent = game.getPermanent(getSourceId());
|
||||||
if (sourcePermanent.isAttacking()) {
|
if (sourcePermanent.isAttacking()) {
|
||||||
for (CombatGroup combatGroup: game.getCombat().getGroups()) {
|
for (CombatGroup combatGroup: game.getCombat().getGroups()) {
|
||||||
if (combatGroup.getBlockers().isEmpty()) {
|
if (combatGroup.getBlockers().isEmpty() && combatGroup.getAttackers().contains(getSourceId())) {
|
||||||
|
// check if a player is attacked (instead of a planeswalker)
|
||||||
Player defendingPlayer = game.getPlayer(combatGroup.getDefenderId());
|
Player defendingPlayer = game.getPlayer(combatGroup.getDefenderId());
|
||||||
if (defendingPlayer != null) {
|
if (defendingPlayer != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRule() {
|
public String getRule() {
|
||||||
return "Whenever Master of Cruelties attacks a player and isn't blocked, " + super.getRule();
|
return "Whenever {this} attacks a player and isn't blocked, " + super.getRule();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -189,11 +188,7 @@ class MasterOfCrueltiesNoDamageEffect extends ReplacementEffectImpl<MasterOfCrue
|
||||||
case DAMAGE_PLAYER:
|
case DAMAGE_PLAYER:
|
||||||
case DAMAGE_PLANESWALKER:
|
case DAMAGE_PLANESWALKER:
|
||||||
DamageEvent damageEvent = (DamageEvent) event;
|
DamageEvent damageEvent = (DamageEvent) event;
|
||||||
if (event.getSourceId().equals(source.getSourceId()) && damageEvent.isCombatDamage()) {
|
return event.getSourceId().equals(source.getSourceId()) && damageEvent.isCombatDamage();
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return event.getFlag();
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue