From 5ad8b94831952c7b22d223b50ddcf22b07406746 Mon Sep 17 00:00:00 2001 From: stujones11 Date: Wed, 30 Mar 2016 19:04:12 +0100 Subject: [PATCH] Simplify turret operator attachment, fixes #11 --- turret.lua | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/turret.lua b/turret.lua index f56769d..67472d9 100644 --- a/turret.lua +++ b/turret.lua @@ -80,22 +80,12 @@ minetest.register_entity("shooter:turret_entity", { get_turret_entity(self.pos) end, on_rightclick = function(self, clicker) - if self.player == nil then + if self.player then + self.player:set_detach() + self.player = nil + else clicker:set_attach(self.object, "", {x=0,y=5,z=-8}, {x=0,y=0,z=0}) self.player = clicker - else - self.player:set_detach() - local yaw = self.yaw + math.pi / 2 - local dir = vector.normalize({ - x = math.cos(yaw), - y = 0, - z = math.sin(yaw), - }) - local pos = vector.subtract(self.player:getpos(), dir) - minetest.after(0.2, function(player) - player:setpos(pos) - end, self.player) - self.player = nil end end, on_step = function(self, dtime)