From 87c4b493f8d887d47f3fb52fefaf2e90b9352e1e Mon Sep 17 00:00:00 2001
From: Zughy <4279489-marco_a@users.noreply.gitlab.com>
Date: Sat, 7 Nov 2020 01:21:46 +0100
Subject: [PATCH] Latest ball fixes revert, waiting for MT 5.4

---
 bl_arena_lib/arena_manager.lua |  9 +++++++++
 bl_modes/TD/ball.lua           | 25 +++++++------------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/bl_arena_lib/arena_manager.lua b/bl_arena_lib/arena_manager.lua
index db90a4f..c8fbfcd 100644
--- a/bl_arena_lib/arena_manager.lua
+++ b/bl_arena_lib/arena_manager.lua
@@ -92,6 +92,7 @@ end)
 
 
 
+--[[TODO: waiting for 5.4 to fix a few bugs
 arena_lib.on_quit("block_league", function(arena, p_name)
   if minetest.get_player_by_name(p_name):get_children()[1] then
     minetest.get_player_by_name(p_name):get_children()[1]:get_luaentity():detach()
@@ -102,6 +103,14 @@ end)
 
 
 
+arena_lib.on_disconnect("block_league", function(arena, p_name)
+  if minetest.get_player_by_name(p_name):get_children()[1] then
+    minetest.get_player_by_name(p_name):get_children()[1]:get_luaentity():detach()
+  end
+end)]]
+
+
+
 
 
 ----------------------------------------------
diff --git a/bl_modes/TD/ball.lua b/bl_modes/TD/ball.lua
index b86ac17..ee6a6a4 100644
--- a/bl_modes/TD/ball.lua
+++ b/bl_modes/TD/ball.lua
@@ -147,6 +147,7 @@ function ball:on_step(d_time, moveresult)
       return end
 
       self:detach()
+      self:oscillate()
 
       return
     end
@@ -186,32 +187,20 @@ end
 
 
 
-function ball:on_detach(parent)
-
-  self.wielder = parent
-  self:detach()
-  self:oscillate()
-
-end
-
-
-
 function ball:detach()
 
   local player = self.wielder
 
   announce_ball_possession_change(self.arena, player:get_player_name(), true)
 
-  if player then
-    player:get_meta():set_int("bl_has_ball", 0)
-    player:set_physics_override({
-              speed = 0,
-              jump = 0
-    })
+  player:get_meta():set_int("bl_has_ball", 0)
+  player:set_physics_override({
+            speed = 0,
+            jump = 0
+  })
 
+  self.object:set_detach()
 
-    self.object:set_detach()
-  end
   self.wielder = nil
   self.timer_bool = true
   self.timer = 0