From c6025710a4866ec1452e9a37586718588b50c329 Mon Sep 17 00:00:00 2001
From: Agetian <Agetian@269b9781-a132-4a9b-9d4e-f004f1b56b58>
Date: Thu, 28 Sep 2017 18:21:48 +0000
Subject: [PATCH] - A more generic implementation for the previous commit.

git-svn-id: http://svn.slightlymagic.net/forge/trunk@35822 269b9781-a132-4a9b-9d4e-f004f1b56b58
---
 forge-game/src/main/java/forge/game/Game.java | 2 +-
 forge-gui/res/cardsfolder/b/bone_dancer.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index 23839ea3..7f1be05a 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -884,7 +884,7 @@ public class Game {
         }
         for (Card c : p.getOpponents().getCardsIn(ZoneType.Battlefield)) {
             // Bone Dancer is important when an opponent has it active on the battlefield
-            if (c.hasSVar("NeedsOrderedGraveyard") && c.getName().equals("Bone Dancer")) {
+            if ("OPPONENT".equals(c.getSVar("NeedsOrderedGraveyard"))) {
                 return true;
             }
         }
diff --git a/forge-gui/res/cardsfolder/b/bone_dancer.txt b/forge-gui/res/cardsfolder/b/bone_dancer.txt
index 0f5622b1..1b1837f3 100644
--- a/forge-gui/res/cardsfolder/b/bone_dancer.txt
+++ b/forge-gui/res/cardsfolder/b/bone_dancer.txt
@@ -5,6 +5,6 @@ PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DBChangeZone | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may put the top creature card of defending player's graveyard onto the battlefield under your control. If you do, CARDNAME assigns no combat damage this turn.
 SVar:DBChangeZone:DB$ChangeZoneAll | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.TopGraveyardCreature+DefenderCtrl | GainControl$ True | ChangeNum$ 1 | SubAbility$ DBNoCombatDamage
 SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage
-SVar:NeedsOrderedGraveyard:TRUE
+SVar:NeedsOrderedGraveyard:OPPONENT
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bone_dancer.jpg
 Oracle:Whenever Bone Dancer attacks and isn't blocked, you may put the top creature card of defending player's graveyard onto the battlefield under your control. If you do, Bone Dancer assigns no combat damage this turn.