diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index 2a38b5ff30a..5e54e1ccc86 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -304,7 +304,7 @@ public final class AbilityFactory_ChangeZone { Card source = af.getHostCard(); HashMap params = af.getMapParams(); Constant.Zone origin = Constant.Zone.smartValueOf(params.get("Origin")); - //String destination = params.get("Destination"); + String destination = params.get("Destination"); if (abCost != null) { // AI currently disabled for these costs @@ -359,6 +359,12 @@ public final class AbilityFactory_ChangeZone { return false; } } + + //don't use fetching to top of library/graveyard before main2 + if(AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases") + && !destination.equals("Battlefield") && !destination.equals("Hand")) { + return false; + } chance &= (r.nextFloat() < .8);