From 90cc44cacfe961fe60ba3a6ecb5cbec349259913 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Fri, 21 Aug 2020 17:23:39 +0100 Subject: [PATCH] Changed DiesAttachedTriggeredAbility.java to check if description has "equipped", if so, writes "Whenever" instead of "When" resolves#6990 and fixes Malefic Scythe in #6643 Signed-off-by: Andre Cabaca --- .../abilities/common/DiesAttachedTriggeredAbility.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java index 4e7c1cda0a..a9874d1f46 100644 --- a/Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DiesAttachedTriggeredAbility.java @@ -115,7 +115,14 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - StringBuilder sb = new StringBuilder("When ").append(attachedDescription); + StringBuilder sb = new StringBuilder(); + if(attachedDescription.startsWith("equipped")) { + sb.append("Whenever "); + } + else { + sb.append("When "); + } + sb.append(attachedDescription); if (diesRuleText) { sb.append(" dies, "); } else {