Boats: Check player attached object

diff --git a/mods/boats/init.lua b/mods/boats/init.lua
index e17d8b1b78addbbb777b2316ba966e417d00248a..a7e62e43da9ca1d9b3096f95ca9de2e3b872ac7a 100644 (file)
--- a/mods/boats/init.lua
+++ b/mods/boats/init.lua
@@ -62,6 +62,14 @@ function boat.on_rightclick(self, clicker)
                        clicker:setpos(pos)
                end)
        elseif not self.driver then
+               local attach = clicker:get_attach()
+               if attach and attach:get_luaentity() then
+                       local luaentity = attach:get_luaentity()
+                       if luaentity.driver then
+                               luaentity.driver = nil
+                       end
+                       clicker:set_detach()
+               end
                self.driver = clicker
                clicker:set_attach(self.object, "",
                        {x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
@@ -88,8 +96,7 @@ function boat.get_staticdata(self)
 end
 
 
-function boat.on_punch(self, puncher, time_from_last_punch,
-               tool_capabilities, direction)
+function boat.on_punch(self, puncher)
        if not puncher or not puncher:is_player() or self.removed then
                return
        end