From efd9b6a0fc95adbcfb42eefd23c3720c2b426b8c Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 8 Mar 2019 12:49:06 +0300
Subject: [PATCH 1/3] - Fix a bug with the AI not considering Adapt correctly
 during attack.

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 800f623ca5e..5ecd0c42f40 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -1455,7 +1455,7 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (ability.hasParam("Adapt") && blocker != null && blocker.getCounters(CounterType.P1P1) > 0) {
+                if (ability.hasParam("Adapt") && attacker.getCounters(CounterType.P1P1) > 0) {
                     continue;
                 }
 

From e4bd18e25c1d97883d60647463cdfcb2856f5a90 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 8 Mar 2019 12:50:15 +0300
Subject: [PATCH 2/3] - Additional fix for the other stat.

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 5ecd0c42f40..48172bc1635 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -1692,7 +1692,7 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (ability.hasParam("Adapt") && blocker.getCounters(CounterType.P1P1) > 0) {
+                if (ability.hasParam("Adapt") && attacker.getCounters(CounterType.P1P1) > 0) {
                     continue;
                 }
 

From e23acfb5de971f8b50438fb8cceef5ee19a9e7b8 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 10 Mar 2019 18:29:36 +0300
Subject: [PATCH 3/3] - Preparing Forge for Android publish 1.6.22.001
 [incremental].

---
 forge-gui-android/pom.xml             | 2 +-
 forge-gui-ios/pom.xml                 | 2 +-
 forge-gui-mobile/src/forge/Forge.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 19170c7812a..572082bb0ee 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -6,7 +6,7 @@
         <packaging.type>jar</packaging.type>
         <build.min.memory>-Xms1024m</build.min.memory>
         <build.max.memory>-Xmx1536m</build.max.memory>
-        <alpha-version>1.6.21.003</alpha-version>
+        <alpha-version>1.6.22.001</alpha-version>
         <sign.keystore>keystore</sign.keystore>
         <sign.alias>alias</sign.alias>
         <sign.storepass>storepass</sign.storepass>
diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml
index 1da309eaa49..596f5ff16f8 100644
--- a/forge-gui-ios/pom.xml
+++ b/forge-gui-ios/pom.xml
@@ -6,7 +6,7 @@
         <packaging.type>jar</packaging.type>
         <build.min.memory>-Xms128m</build.min.memory>
         <build.max.memory>-Xmx2048m</build.max.memory>
-        <alpha-version>1.6.21.003</alpha-version>
+        <alpha-version>1.6.22.001</alpha-version>
     </properties>
 
     <parent>
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index f5708da10fe..0b13c962753 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Stack;
 
 public class Forge implements ApplicationListener {
-    public static final String CURRENT_VERSION = "1.6.21.003";
+    public static final String CURRENT_VERSION = "1.6.22.001";
 
     private static final ApplicationListener app = new Forge();
     private static Clipboard clipboard;