From 7537f59bda885ebfa60eb86e11ea62161ede9732 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 22 Oct 2018 20:04:32 +0300
Subject: [PATCH] Bugfix: water units can't conquer cities

---
 core/src/com/unciv/logic/battle/Battle.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index 310facb614..e81b4cd66f 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -59,7 +59,8 @@ class Battle(val gameInfo:GameInfo) {
 
         if(defender.isDefeated()
                 && defender.getUnitType() == UnitType.City
-                && attacker.isMelee()){
+                && attacker.isMelee()
+                && attacker.getUnitType().isLandUnit()){
             conquerCity((defender as CityCombatant).city, attacker)
         }