From 2d07036d3f169587bd51498d51e74179b0643cef Mon Sep 17 00:00:00 2001
From: Quercitron <oldquercitron@gmail.com>
Date: Fri, 4 Jul 2014 03:37:53 +0400
Subject: [PATCH] * Small fixes

---
 .../mage/sets/bornofthegods/TokenAndCounters/GoldToken.java  | 1 -
 Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java            | 5 ++---
 Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java        | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java
index eec44978ff0..1880d4dd855 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/TokenAndCounters/GoldToken.java
@@ -47,7 +47,6 @@ public class GoldToken extends Token {
         super("Gold", "colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\"");
         this.setOriginalExpansionSetCode("BNG");
         cardType.add(CardType.ARTIFACT);
-        subtype.add("Gold");
 
         Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new SacrificeSourceCost());
         ability.addChoice(new ChoiceColor());
diff --git a/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java b/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java
index ff2ba87ab6d..940c8d796d4 100644
--- a/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java
+++ b/Mage.Sets/src/mage/sets/judgment/ErhnamDjinn.java
@@ -30,8 +30,7 @@ package mage.sets.judgment;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
-import mage.abilities.common.BeginningOfUntapTriggeredAbility;
-import mage.abilities.effects.Effect;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.ForestwalkAbility;
 import mage.cards.CardImpl;
@@ -72,7 +71,7 @@ public class ErhnamDjinn extends CardImpl {
         GainAbilityTargetEffect effect = new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.Custom,
         "target non-Wall creature an opponent controls gains forestwalk until your next upkeep");
         effect.setDurationToPhase(PhaseStep.UPKEEP);
-        Ability ability = new BeginningOfUntapTriggeredAbility(effect, TargetController.YOU, false);
+        Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false);
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java
index 6dc62788ace..c90ad82cb67 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java
@@ -103,11 +103,11 @@ class ArcTrailEffect extends OneShotEffect {
             }
 
             if (permanent != null) {
-                applied |= (permanent.damage( damage, source.getSourceId(), game, false, true ) > 0);
+                applied |= (permanent.damage( damage, source.getSourceId(), game, true, false ) > 0);
             }
             Player player = game.getPlayer(target);
             if (player != null) {
-                applied |= (player.damage( damage, source.getSourceId(), game, false, true ) > 0);
+                applied |= (player.damage( damage, source.getSourceId(), game, true, false ) > 0);
             }
 
             twoDamageDone = true;