From 90eb4394134e544d7d57ec85b96bee93064b84b0 Mon Sep 17 00:00:00 2001 From: Paul Wedeck Date: Fri, 1 May 2020 17:44:18 +0200 Subject: [PATCH] patch the second bug in #792 --- .../src/main/java/jsettlers/logic/movable/Movable.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jsettlers.logic/src/main/java/jsettlers/logic/movable/Movable.java b/jsettlers.logic/src/main/java/jsettlers/logic/movable/Movable.java index 224b42f61b..0d3af9a09b 100644 --- a/jsettlers.logic/src/main/java/jsettlers/logic/movable/Movable.java +++ b/jsettlers.logic/src/main/java/jsettlers/logic/movable/Movable.java @@ -955,6 +955,9 @@ public final int getID() { * Type the movable should be converted to. */ public final void convertTo(EMovableType newMovableType) { + // settlers on ferries should not be controllable + if(state == EMovableState.ON_FERRY) return; + if (newMovableType == EMovableType.BEARER && !player.equals(grid.getPlayerAt(position))) { return; // can't convert to bearer if the ground does not belong to the player }