From b39439a3ae24a0cd33cc0212e89048e1379d1527 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 18 Aug 2017 02:21:50 +0200
Subject: [PATCH] Fixed minor bugs with boats moving items

---
 game.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game.cpp b/game.cpp
index d71de4d8..51a30272 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6484,10 +6484,11 @@ bool movepcto(int d, int subdir, bool checkonly) {
         }
       
       if(checkonly) return true;
+      if(c2->item && !cwt.c->item) moveItem(c2, cwt.c, false), boatmove = true;
       placeWater(c2, cwt.c);
       moveBoat(c2, cwt.c);
       c2->mondir = neighborId(c2, cwt.c);
-      if(cwt.c->item) moveItem(cwt.c, c2, true), boatmove = true;
+      if(c2->item) boatmove = !boatmove;
       goto boatjump;
       }