From a1d59b99cb37bfb7e8d91910e4b242170e6193b7 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 14 Jun 2021 21:56:47 +0200
Subject: [PATCH] https://bugs.eressea.de/view.php?id=2757 Kampf auf See war
 kaputt.

---
 src/laws.c      | 4 ++--
 src/laws.test.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/laws.c b/src/laws.c
index e921a5530..ca4f04226 100644
--- a/src/laws.c
+++ b/src/laws.c
@@ -3609,9 +3609,9 @@ bool long_order_allowed(const unit *u, bool flags_only)
         */
         return false;
     }
+    if (flags_only) return true;
     if (fval(r->terrain, SEA_REGION) && !(u_race(u)->flags & RCF_SWIM)) {
-        if (flags_only) return false;
-        else if (u_race(u) != get_race(RC_AQUARIAN)) {
+        if (u_race(u) != get_race(RC_AQUARIAN)) {
             /* error message disabled by popular demand */
             return false;
         }
diff --git a/src/laws.test.c b/src/laws.test.c
index 3726bbca0..5cce536aa 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -1908,6 +1908,7 @@ static void test_long_order_on_ocean(CuTest *tc) {
     test_setup();
     rc = test_create_race("pikachu");
     u = test_create_unit(test_create_faction_ex(rc, NULL), test_create_ocean(0, 0));
+    CuAssertTrue(tc, long_order_allowed(u, true));
     CuAssertTrue(tc, !long_order_allowed(u, false));
     rc->flags |= RCF_SWIM;
     CuAssertTrue(tc, long_order_allowed(u, false));
@@ -1918,11 +1919,10 @@ static void test_long_order_on_ocean(CuTest *tc) {
     rc = test_create_race("aquarian");
     u = test_create_unit(test_create_faction_ex(rc, NULL), u->region);
     CuAssertTrue(tc, long_order_allowed(u, false));
-    CuAssertTrue(tc, !long_order_allowed(u, true));
+    CuAssertTrue(tc, long_order_allowed(u, true));
     u->faction->flags |= FFL_PAUSED;
     CuAssertTrue(tc, !long_order_allowed(u, true));
     CuAssertTrue(tc, !long_order_allowed(u, false));
-    u->faction->flags -= FFL_PAUSED;
     test_teardown();
 }