From e245ff02c2e22e098207ae6ab1da30f252e16524 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Fri, 14 Oct 2022 22:55:52 +0200
Subject: [PATCH] Place player in front of choat, disallow passenger

---
 mods/ENTITIES/mcl_boats/init.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua
index dc1fbd78f..6f2ff0aab 100644
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@@ -65,9 +65,13 @@ local function set_double_attach(boat)
 	boat._passenger:set_attach(boat.object, "",
 		{x = 0, y = 0.42, z = -2.2}, {x = 0, y = 0, z = 0})
 end
+local function set_choat_attach(boat)
+	boat._driver:set_attach(boat.object, "",
+		{x = 0, y = 0.42, z = 1.8}, {x = 0, y = 0, z = 0})
+end
 
 local function attach_object(self, obj)
-	if self._driver then
+	if self._driver and not self._inv_id then
 		if self._driver:is_player() then
 			self._passenger = obj
 		else
@@ -77,7 +81,11 @@ local function attach_object(self, obj)
 		set_double_attach(self)
 	else
 		self._driver = obj
-		set_attach(self)
+		if self._inv_id then
+			set_choat_attach(self)
+		else
+			set_attach(self)
+		end
 	end
 
 	local visual_size = get_visual_size(obj)