From 4ddf8111185c0e83c76728704fef42ee95250502 Mon Sep 17 00:00:00 2001 From: schnautzr Date: Sat, 23 Feb 2019 11:37:28 -0600 Subject: [PATCH 1/2] Replace unmappable characters. --- forge-game/src/main/java/forge/game/GameAction.java | 2 +- .../src/main/java/forge/game/trigger/TriggerHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 38394c3ea30..041fde095bf 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -1874,7 +1874,7 @@ public class GameAction { // Assumes that the list of players is in APNAP order, which should be the case // Optional here as well to handle the way that mulligans do the choice // 701.17. Scry - // 701.17a To “scry N” means to look at the top N cards of your library, then put any number of them + // 701.17a To "scry N" means to look at the top N cards of your library, then put any number of them // on the bottom of your library in any order and the rest on top of your library in any order. // 701.17b If a player is instructed to scry 0, no scry event occurs. Abilities that trigger whenever a // player scries won’t trigger. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 6d10443816a..0197f253336 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -735,7 +735,7 @@ public class TriggerHandler { } } } else if (kw.startsWith("Dieharmonicon")) { - // 700.4. The term dies means “is put into a graveyard from the battlefield.” + // 700.4. The term dies means "is put into a graveyard from the battlefield." if (runParams.get("Origin") instanceof String) { final String origin = (String) runParams.get("Origin"); if ("Battlefield".equals(origin) && runParams.get("Destination") instanceof String) { @@ -765,7 +765,7 @@ public class TriggerHandler { n++; } } else if (kw.startsWith("Dieharmonicon")) { - // 700.4. The term dies means “is put into a graveyard from the battlefield.” + // 700.4. The term dies means "is put into a graveyard from the battlefield." final String valid = kw.split(":")[1]; if (!table.filterCards(ImmutableList.of(ZoneType.Battlefield), ZoneType.Graveyard, valid, ck, null).isEmpty()) { From fe4ce14a4bab7953df3816f451977f9bf08d4eb2 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 23 Feb 2019 21:26:06 +0100 Subject: [PATCH 2/2] TriggerChangesZone: this check only for nonStatic Trigger --- .../src/main/java/forge/game/trigger/TriggerChangesZone.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index a4aa12b4a72..87c150ee7b7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -113,7 +113,8 @@ public class TriggerChangesZone extends Trigger { } // if it is a die trigger, and the hostcard is the moved one, but it doesn't has the trigger - if (leavesBattlefield && moved.equals(getHostCard()) && !moved.hasTrigger(this)) { + // only for non-static + if (!isStatic() && leavesBattlefield && moved.equals(getHostCard()) && !moved.hasTrigger(this)) { return false; } }