From bc77b825cb64fa00994a773da17a6d0bd261d896 Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 19 Apr 2018 20:08:43 +1000 Subject: [PATCH] Fix for Darkbarony plane (1 life) --- Mage/src/main/java/mage/game/GameImpl.java | 6 +++--- .../java/mage/game/command/planes/TheDarkBaronyPlane.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 86cc1bd201..a460253693 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1078,7 +1078,7 @@ public abstract class GameImpl implements Game, Serializable { if (gameOptions.planeChase) { Plane plane = Plane.getRandomPlane(); plane.setControllerId(startingPlayerId); - addPlane(plane, null, getActivePlayerId()); + addPlane(plane, null, startingPlayerId); state.setPlaneChase(this, gameOptions.planeChase); } } @@ -1565,14 +1565,14 @@ public abstract class GameImpl implements Game, Serializable { } state.addCommandObject(newPlane); informPlayers("You have planeswalked to " + newPlane.getLogName()); - + // Fire off the planeswalked event GameEvent event = new GameEvent(GameEvent.EventType.PLANESWALK, newPlane.getId(), null, newPlane.getId(), 0, true); if (!replaceEvent(event)) { GameEvent ge = new GameEvent(GameEvent.EventType.PLANESWALKED, newPlane.getId(), null, newPlane.getId(), 0, true); fireEvent(ge); } - + return true; } diff --git a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java index 4cfeecf70d..c626ad0828 100644 --- a/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TheDarkBaronyPlane.java @@ -66,9 +66,9 @@ public class TheDarkBaronyPlane extends Plane { this.setName("Plane - The Dark Barony"); this.setExpansionSetCodeForImage("PCA"); - // Whenever a nonblack card is put into a player's graveyard from anywhere, that player loses 2 life + // Whenever a nonblack card is put into a player's graveyard from anywhere, that player loses 1 life Ability ability = new PutCardIntoGraveFromAnywhereAllTriggeredAbility(Zone.COMMAND, - new LoseLifeTargetEffect(2), false, filter, TargetController.ANY, SetTargetPointer.PLAYER); + new LoseLifeTargetEffect(1), false, filter, TargetController.ANY, SetTargetPointer.PLAYER); this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, each player dicards a card