Drop boat if no room in inventory to pick up

init.lua

@@ -88,13 +88,15 @@ function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, d
 	end
 	if not self.driver then
 		self.removed = true
-		-- delay remove to ensure player is detached
-		minetest.after(0.1, function()
-			self.object:remove()
-		end)
 		if not minetest.setting_getbool("creative_mode") then
-			puncher:get_inventory():add_item("main", "boats:boat")
+			local inv = puncher:get_inventory()
+			if inv:room_for_item("main", "boats:boat") then
+				inv:add_item("main", "boats:boat")
+			else
+				minetest.add_item(self.object:getpos(), "boats:boat")
+			end
 		end
+		self.object:remove()
 	end
 end