From 0fb3c2256e530de2ff07ad7c4a25c4cf5435207e Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 3 Jun 2018 13:56:03 +0300
Subject: [PATCH] OKAY FOUND THE BUG! So, now military units can't enter tiles
 which have an enemy civilian unit in them. Honestly I would not have guessed
 that this was the problem.

---
 core/src/com/unciv/logic/map/MapUnit.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index f3d9739791..9c481e936b 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -158,7 +158,7 @@ class MapUnit {
         if(tile.isCityCenter() && tile.getOwner()!!.civName!=owner) return false
         if (getBaseUnit().unitType==UnitType.Civilian)
             return tile.civilianUnit==null && (tile.militaryUnit==null || tile.militaryUnit!!.owner==owner)
-       else return tile.militaryUnit==null
+       else return tile.militaryUnit==null && (tile.civilianUnit==null || tile.civilianUnit!!.owner==owner)
     }
 
     fun isIdle(): Boolean {