From daf34c6bf0ee354566a9b661fe1ea4e0b18d0e26 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 29 Sep 2016 17:31:20 +0200
Subject: [PATCH] Some fixes to Emblems of Starwars set and Elspeth, Sun
 Champion.

---
 Mage.Sets/src/mage/sets/starwars/ObiWanKenobi.java          | 4 ++--
 Mage.Sets/src/mage/sets/starwars/YodaJediMaster.java        | 6 +++---
 Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java     | 4 ++--
 .../java/mage/cards/repository/ExpansionRepository.java     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/starwars/ObiWanKenobi.java b/Mage.Sets/src/mage/sets/starwars/ObiWanKenobi.java
index 6ee53f72f0d..7c69170d52c 100644
--- a/Mage.Sets/src/mage/sets/starwars/ObiWanKenobi.java
+++ b/Mage.Sets/src/mage/sets/starwars/ObiWanKenobi.java
@@ -98,8 +98,8 @@ class ObiWanKenobiEmblem extends Emblem {
     // Creatures you control get +1/+1 and have vigilance, first strike, and lifelink
     public ObiWanKenobiEmblem() {
         this.setName("Emblem - Obi-Wan");
-        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield));
-        Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield);
+        Ability ability = new SimpleStaticAbility(Zone.COMMAND, new BoostControlledEffect(1, 1, Duration.EndOfGame));
+        Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfGame);
         effect.setText("and have vigilance,");
         ability.addEffect(effect);
         effect = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield);
diff --git a/Mage.Sets/src/mage/sets/starwars/YodaJediMaster.java b/Mage.Sets/src/mage/sets/starwars/YodaJediMaster.java
index 874ba15067b..87a5dd0117d 100644
--- a/Mage.Sets/src/mage/sets/starwars/YodaJediMaster.java
+++ b/Mage.Sets/src/mage/sets/starwars/YodaJediMaster.java
@@ -138,10 +138,10 @@ class YodaEmblem extends Emblem {
     // You get an emblem with "Hexproof, you and your creatures have."
     public YodaEmblem() {
         this.setName("Emblem - Yoda");
-        Effect effect = new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield);
+        Effect effect = new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.EndOfGame);
         effect.setText("Hexproof,");
-        Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
-        effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield);
+        Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect);
+        effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.EndOfGame);
         effect.setText(" you and your creatures have");
         ability.addEffect(effect);
         getAbilities().add(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java b/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java
index d68650b593f..4ed8007bb14 100644
--- a/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java
+++ b/Mage.Sets/src/mage/sets/theros/ElspethSunsChampion.java
@@ -93,8 +93,8 @@ class ElspethSunsChampionEmblem extends Emblem {
 
     public ElspethSunsChampionEmblem() {
         this.setName("EMBLEM: Elspeth, Sun's Champion");
-        Ability ability = new SimpleStaticAbility(Zone.COMMAND, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false));
-        ability.addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter));
+        Ability ability = new SimpleStaticAbility(Zone.COMMAND, new BoostControlledEffect(2, 2, Duration.EndOfGame, filter, false));
+        ability.addEffect(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfGame, filter));
         this.getAbilities().add(ability);
 
     }
diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
index 99271a0b405..cf4f72c7b0d 100644
--- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
+++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
@@ -27,7 +27,7 @@ public enum ExpansionRepository {
     private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
     private static final String VERSION_ENTITY_NAME = "expansion";
     private static final long EXPANSION_DB_VERSION = 5;
-    private static final long EXPANSION_CONTENT_VERSION = 10;
+    private static final long EXPANSION_CONTENT_VERSION = 11;
 
     private Dao<ExpansionInfo, Object> expansionDao;