patch the second bug in jsettlers#792

paulwedeck · May 1, 2020 · 90eb439 · 90eb439
1 parent c18052e
commit 90eb439
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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
 		}