From 13f0a90258fd796392205f4a380b87083e9b5f53 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 4 Jul 2015 15:37:22 +0200
Subject: [PATCH 1/2] Fixed build bug of Server Console project.

---
 Mage.Server.Console/pom.xml | 47 -------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml
index 01aa84df34..839ee4bfd6 100644
--- a/Mage.Server.Console/pom.xml
+++ b/Mage.Server.Console/pom.xml
@@ -31,51 +31,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${manifest.file}</manifestFile>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>mage.server.console.ConsoleFrame</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/main/assembly/distribution.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <finalName>mage-console</finalName>
-    </build>
-
-    <properties>
-        <manifest.file>src/main/resources/META-INF/MANIFEST.MF</manifest.file>
-    </properties>
 </project>

From b481b2623f57ccf789dffa5e9f422bbd8d6b2288 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 4 Jul 2015 15:42:53 +0200
Subject: [PATCH 2/2] * Erebos's Titan - Fixed that the ability triggers from
 graveyard instead from battlefield.

---
 Mage.Sets/src/mage/sets/magicorigins/ErebossTitan.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Sets/src/mage/sets/magicorigins/ErebossTitan.java b/Mage.Sets/src/mage/sets/magicorigins/ErebossTitan.java
index 6d4d632fc9..cb87647fbf 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/ErebossTitan.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/ErebossTitan.java
@@ -95,7 +95,7 @@ public class ErebossTitan extends CardImpl {
 class ErebossTitanTriggeredAbility extends TriggeredAbilityImpl {
 
     public ErebossTitanTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new DoIfCostPaid(new ReturnSourceFromGraveyardToHandEffect(), new DiscardCardCost()));
+        super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnSourceFromGraveyardToHandEffect(), new DiscardCardCost()));
     }
 
     public ErebossTitanTriggeredAbility(final ErebossTitanTriggeredAbility ability) {