diff --git a/forge-game/src/main/java/forge/game/card/CardCopyService.java b/forge-game/src/main/java/forge/game/card/CardCopyService.java index d7983cf3431..36165a043d6 100644 --- a/forge-game/src/main/java/forge/game/card/CardCopyService.java +++ b/forge-game/src/main/java/forge/game/card/CardCopyService.java @@ -162,7 +162,6 @@ public class CardCopyService { } } - // ======================================================== // LKI functions @@ -186,7 +185,6 @@ public class CardCopyService { return new CardCopyService(c).getLKICopy(cachedMap); } - public static GameEntity getLKICopy(final GameEntity c, Map cachedMap) { // Ideally, we'd just convert all calls to getLKICopy to use the Map version if (c instanceof Card) { @@ -408,5 +406,4 @@ public class CardCopyService { return newCopy; } - } 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 da4f2fd9215..eb825725674 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -242,8 +242,8 @@ public class TriggerHandler { for (final Trigger t : c.getTriggers()) { if ( TriggerType.Exploited.equals(t.getMode()) || - TriggerType.Sacrificed.equals(t.getMode()) || TriggerType.Destroyed.equals(t.getMode()) || + TriggerType.Sacrificed.equals(t.getMode()) || TriggerType.SacrificedOnce.equals(t.getMode()) || ((TriggerType.ChangesZone.equals(t.getMode()) || TriggerType.ChangesZoneAll.equals(t.getMode())) && "Battlefield".equals(t.getParam("Origin")))) { // TODO needs additional logic in case origin=Any registerOneTrigger(t);