From 8a2fe52291510b162c987faaad7ff5d249ec9c35 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 24 Jul 2008 16:51:11 +0000
Subject: [PATCH] =?UTF-8?q?http://bugs.eressea.de/view.php=3Fid=3D1465=20"?=
 =?UTF-8?q?Fliehende=20Meermenschenkapit=C3=A4ne=20ertrinken"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/battle.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 799b0d93d..86d99b6d4 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -2434,7 +2434,9 @@ aftermath(battle * b)
           setguard(du, GUARD_NONE);
           /* must leave ships or buildings, or a stealthy hobbit 
            * can hold castles indefinitely */
-          leave(du->region, du);
+          if (!fval(r->terrain, SEA_REGION)) {
+            leave(du->region, du);
+          }
 #ifndef SIMPLE_ESCAPE
           if (df->run.region) {
             run_to(du, df->run.region);