From 6e4908acc33afa4ea7d3796d351de8a7d30d9c3b Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Wed, 15 Jan 2020 13:37:15 +0000 Subject: [PATCH] Update StaticAbilityContinuous: for Gain Abilities, only set OriginalHost if it wasn't already set --- .../forge/game/staticability/StaticAbilityContinuous.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 87058d00c38..cc057c10079 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -589,7 +589,9 @@ public final class StaticAbilityContinuous { newSA.setRestrictions(sa.getRestrictions()); newSA.getRestrictions().setLimitToCheck(params.get("GainsAbilitiesLimitPerTurn")); } - newSA.setOriginalHost(c); + if (newSA.getOriginalHost() == null) { + newSA.setOriginalHost(c); + } newSA.setOriginalAbility(sa); // need to be set to get the Once Per turn Clause correct newSA.setGrantorStatic(stAb); newSA.setIntrinsic(false);