From 21c7c74b31ddd549c24659cd7a7a0571b783ec61 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Thu, 24 Aug 2017 13:29:46 +0000
Subject: [PATCH] =?UTF-8?q?-=20Attempting=20to=20fix=20Dragon=20Presence?=
 =?UTF-8?q?=20cards,=20part=201:=20"dragon=20presence"=20apparently=20care?=
 =?UTF-8?q?s=20about=20the=20current=20battlefield=20state,=20not=20the=20?=
 =?UTF-8?q?LKI=20(from=20Gatherer:=20"you=20must=20control=20a=20Dragon=20?=
 =?UTF-8?q?as=20you=20are=20finished=20casting=20the=20spell=20to=20get=20?=
 =?UTF-8?q?the=20bonus.=20For=20example,=20if=20you=20lose=20control=20of?=
 =?UTF-8?q?=20your=20only=20Dragon=20while=20casting=20the=20spell=20(beca?=
 =?UTF-8?q?use,=20for=20example,=20you=20sacrificed=20it=20to=20activate?=
 =?UTF-8?q?=20a=20mana=20ability),=20you=20won=E2=80=99t=20get=20the=20bon?=
 =?UTF-8?q?us").=20Also=20fixes=20Orator=20Ojutai=20not=20drawing=20a=20ca?=
 =?UTF-8?q?rd=20at=20all=20when=20a=20Dragon=20is=20present=20on=20the=20b?=
 =?UTF-8?q?attlefield.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 forge-game/src/main/java/forge/game/CardTraitBase.java          | 2 +-
 forge-game/src/main/java/forge/game/card/CardFactoryUtil.java   | 2 +-
 .../java/forge/game/spellability/SpellAbilityCondition.java     | 2 +-
 .../src/main/java/forge/game/staticability/StaticAbility.java   | 2 +-
 forge-gui/res/cardsfolder/o/orator_of_ojutai.txt                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index bb885fb52ba..a05f8babb5e 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -229,7 +229,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView {
             final String type = params.get("Presence");
 
             int revealed = AbilityUtils.calculateAmount(hostCard, "Revealed$Valid " + type, hostCard.getCastSA());
-            int ctrl = AbilityUtils.calculateAmount(hostCard, "Count$LastStateBattlefield " + type + ".YouCtrl", hostCard.getCastSA());
+            int ctrl = AbilityUtils.calculateAmount(hostCard, "Count$Valid " + type + ".inZoneBattlefield+YouCtrl", hostCard.getCastSA());
 
             if (revealed + ctrl == 0) {
                 return false;
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 3dd0ffea9e3..51825aa1800 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1307,7 +1307,7 @@ public class CardFactoryUtil {
 
             if (c.getCastFrom() != null && c.getCastSA() != null) {
                 int revealed = AbilityUtils.calculateAmount(c, "Revealed$Valid " + type, c.getCastSA());
-                int ctrl = AbilityUtils.calculateAmount(c, "Count$LastStateBattlefield " + type + ".YouCtrl", c.getCastSA());
+                int ctrl = AbilityUtils.calculateAmount(c, "Count$Valid " + type + ".inZoneBattlefield+YouCtrl", c.getCastSA());
                 if (revealed + ctrl >= 1) {
                     return doXMath(StringUtils.isNumeric(sq[1]) ? Integer.parseInt(sq[1]) : xCount(c, c.getSVar(sq[1])), m, c);
                 }
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
index ac7536c7fe4..1d0f27b6263 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
@@ -253,7 +253,7 @@ public class SpellAbilityCondition extends SpellAbilityVariables {
             final String type = this.getPresenceCondition();
 
             int revealed = AbilityUtils.calculateAmount(host, "Revealed$Valid " + type, host.getCastSA());
-            int ctrl = AbilityUtils.calculateAmount(host, "Count$LastStateBattlefield " + type + ".YouCtrl", host.getCastSA());
+            int ctrl = AbilityUtils.calculateAmount(host, "Count$Valid " + type + ".inZoneBattlefield+YouCtrl", host.getCastSA());
 
             if (revealed + ctrl == 0) {
                 return false;
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index fb08508e33f..82d38cc49ed 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -586,7 +586,7 @@ public class StaticAbility extends CardTraitBase implements Comparable<StaticAbi
             final String type = getParam("Presence");
 
             int revealed = AbilityUtils.calculateAmount(hostCard, "Revealed$Valid " + type, hostCard.getCastSA());
-            int ctrl = AbilityUtils.calculateAmount(hostCard, "Count$LastStateBattlefield " + type + ".YouCtrl", hostCard.getCastSA());
+            int ctrl = AbilityUtils.calculateAmount(hostCard, "Count$Valid " + type + ".inZoneBattlefield+YouCtrl", hostCard.getCastSA());
 
             if (revealed + ctrl == 0) {
                 return false;
diff --git a/forge-gui/res/cardsfolder/o/orator_of_ojutai.txt b/forge-gui/res/cardsfolder/o/orator_of_ojutai.txt
index 6969c0559dc..d4178d6b5a1 100644
--- a/forge-gui/res/cardsfolder/o/orator_of_ojutai.txt
+++ b/forge-gui/res/cardsfolder/o/orator_of_ojutai.txt
@@ -5,7 +5,7 @@ PT:0/4
 K:Presence:Dragon
 K:Defender
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Presence$ Dragon | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigKicker | Presence$ Dragon | TriggerDescription$ When CARDNAME enters the battlefield, if you revealed a Dragon card or controlled a Dragon as you cast CARDNAME, draw a card.
 SVar:TrigKicker:DB$ Draw | Defined$ You | NumCards$ 1
 DeckHints:Type$Dragon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orator_of_ojutai.jpg