From 28924c1cb70c36b014bb12e50c49a136fbfe3d12 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Mon, 13 May 2019 16:07:29 +0400
Subject: [PATCH] * Commander - fixed that instant/sourcery/enchantment don't
 work from command zone (#5795);

---
 .../mage/abilities/common/CastCommanderAbility.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java b/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
index a549a72310f..c31137dfe88 100644
--- a/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/CastCommanderAbility.java
@@ -15,8 +15,15 @@ public class CastCommanderAbility extends SpellAbility {
 
     public CastCommanderAbility(Card card) {
         super(card.getManaCost(), card.getName(), Zone.COMMAND, SpellAbilityType.BASE);
-        this.costs = card.getSpellAbility() != null ? card.getSpellAbility().getCosts().copy() : new CostsImpl<>();
-        this.timing = TimingRule.SORCERY;
+        if (card.getSpellAbility() != null) {
+            this.getCosts().addAll(card.getSpellAbility().getCosts().copy());
+            this.getEffects().addAll(card.getSpellAbility().getEffects().copy());
+            this.getTargets().addAll(card.getSpellAbility().getTargets().copy());
+            this.timing = card.getSpellAbility().getTiming();
+        } else {
+            this.costs = new CostsImpl<>();
+            this.timing = TimingRule.SORCERY;
+        }
         this.usesStack = true;
         this.controllerId = card.getOwnerId();
         this.sourceId = card.getId();