diff --git a/Mage.Sets/src/mage/cards/f/FaithsReward.java b/Mage.Sets/src/mage/cards/f/FaithsReward.java index 3a739d51d7..2b42bc1c12 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsReward.java +++ b/Mage.Sets/src/mage/cards/f/FaithsReward.java @@ -84,7 +84,7 @@ class FaithsRewardWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { - morMap.add(new MageObjectReference(((ZoneChangeEvent) event).getTarget(), game)); + morMap.add(new MageObjectReference(((ZoneChangeEvent) event).getTarget(), game, 1)); } } diff --git a/Mage.Sets/src/mage/cards/f/FellShepherd.java b/Mage.Sets/src/mage/cards/f/FellShepherd.java index 0856c0f9cb..8265e363d2 100644 --- a/Mage.Sets/src/mage/cards/f/FellShepherd.java +++ b/Mage.Sets/src/mage/cards/f/FellShepherd.java @@ -100,7 +100,7 @@ class FellShepherdWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { - morMap.add(new MageObjectReference(((ZoneChangeEvent) event).getTarget(), game)); + morMap.add(new MageObjectReference(((ZoneChangeEvent) event).getTarget(), game, 1)); } } diff --git a/Mage/src/main/java/mage/MageObjectReference.java b/Mage/src/main/java/mage/MageObjectReference.java index b78a1c22fe..f8ca0fb927 100644 --- a/Mage/src/main/java/mage/MageObjectReference.java +++ b/Mage/src/main/java/mage/MageObjectReference.java @@ -26,13 +26,17 @@ public class MageObjectReference implements Comparable, Ser private final int zoneChangeCounter; public MageObjectReference(MageObject mageObject, Game game) { + this(mageObject, game, 0); + } + + public MageObjectReference(MageObject mageObject, Game game, int offset) { if (mageObject == null) { this.sourceId = null; this.zoneChangeCounter = -1; return; } this.sourceId = mageObject.getId(); - this.zoneChangeCounter = mageObject.getZoneChangeCounter(game); + this.zoneChangeCounter = mageObject.getZoneChangeCounter(game) + offset; } /**