From a412c02e20bfcf4a157123638388cf2cd94ef7bd Mon Sep 17 00:00:00 2001 From: David Leal Date: Thu, 7 Jan 2021 19:35:34 -0600 Subject: [PATCH] Remove grapple if player changes class after throwing (#740) * Remove hook if player has changed... ...their class after firing the hook. * Make grapple don't return to... ...player inventory and improve message. * Update ranged.lua Co-authored-by: LoneWolfHT --- mods/ctf/ctf_classes/ranged.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mods/ctf/ctf_classes/ranged.lua b/mods/ctf/ctf_classes/ranged.lua index 1dabf81..87ed5f7 100644 --- a/mods/ctf/ctf_classes/ranged.lua +++ b/mods/ctf/ctf_classes/ranged.lua @@ -85,5 +85,14 @@ minetest.registered_entities["shooter_hook:hook"].on_step = function(self, dtime self.object:remove() return end + + -- Remove hook if player changes class after throwing it + if not ctf_classes.get(self.user).properties.allow_grapples then + minetest.chat_send_player(self.user, + "Grapples don't work if you change class!") + self.object:remove() + return + end + return old_grapple_step(self, dtime, ...) end