diff --git a/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java b/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java index fdc44ea92cf..1e6af3e6806 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java @@ -94,9 +94,9 @@ class MageSlayerEffect extends OneShotEffect { Permanent equipment = game.getPermanent(source.getSourceId()); if (equipment != null && equipment.getAttachedTo() != null) { int power = game.getPermanent(equipment.getAttachedTo()).getPower().getValue(); - UUID defendingPlayerId = game.getCombat().getDefenderId(equipment.getAttachedTo()); + UUID defendingPlayerId = game.getCombat().getDefendingPlayerId(equipment.getAttachedTo(), game); if (defendingPlayerId != null) { - game.getPlayer(defendingPlayerId).damage(power, id, game, false, true); + game.getPlayer(defendingPlayerId).damage(power, source.getSourceId(), game, false, true); return true; } } diff --git a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java index 35785f70ba4..647a0daea55 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java +++ b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java @@ -91,7 +91,8 @@ class HellriderTriggeredAbility extends TriggeredAbilityImpl { if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) { Permanent source = game.getPermanent(event.getSourceId()); if (source != null && source.getControllerId().equals(controllerId)) { - this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getTargetId())); + UUID defendingPlayerId = game.getCombat().getDefendingPlayerId(event.getSourceId(), game); + this.getEffects().get(0).setTargetPointer(new FixedTarget(defendingPlayerId)); return true; } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java index 2f6a219be66..d0b894258ba 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java @@ -87,7 +87,8 @@ class RaidBombardmentTriggeredAbility extends TriggeredAbilityImpl { Permanent attacker = game.getPermanent(event.getSourceId()); if (attacker != null) { if (attacker.getPower().getValue() <= 2) { - this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getTargetId())); + UUID defendingPlayerId = game.getCombat().getDefendingPlayerId(attacker.getId(), game); + this.getEffects().get(0).setTargetPointer(new FixedTarget(defendingPlayerId)); return true; } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java index 43897e50fe5..cf461632c6b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MyrBattlesphere.java @@ -134,7 +134,7 @@ class MyrBattlesphereEffect extends OneShotEffect { // boost effect game.addEffect(new BoostSourceEffect(tappedAmount, 0, Duration.EndOfTurn), source); // damage to defender - UUID defenderId = game.getCombat().getDefenderId(source.getSourceId()); + UUID defenderId = game.getCombat().getDefendingPlayerId(source.getSourceId(), game); Player defender = game.getPlayer(defenderId); if (defender != null) { defender.damage(tappedAmount, source.getSourceId(), game, false, true);