working around engine bugs

minigame_manager.lua

@@ -325,24 +325,6 @@ arena_lib.on_time_tick('wormball', function(arena)
     end
 
     for pl_name,stats in pairs(arena.players) do
-<<<<<<< Updated upstream
-=======
-
-        --testing
-        local test_pl = minetest.get_player_by_name(pl_name)
-        local test_state = ""
-        if test_pl:get_attach() == nil then
-            test_state = 'not attached'
-        else
-            test_state = 'attached'
-        end
-        --minetest.chat_send_all("time: "..arena.current_time.." player "..pl_name.. ' is '..test_state)
-        
-
-
-
-
->>>>>>> Stashed changes
         local rand_pos = {x = math.random(x1,x2),y = math.random(y1,y2), z=math.random(z1,z2)}
         local item = 'none'
         if math.random(1,3)== 1 then
@@ -561,10 +543,7 @@ minetest.register_globalstep(function(dtime)
                             if player then
                                 player:set_properties({textures = wormball.player_texture_save[pl_name]})
                                 local att = player:get_attach()
-<<<<<<< Updated upstream
-=======
                                 --minetest.chat_send_all('ln517')
->>>>>>> Stashed changes
                                 player:set_detach()
                                 player_api.player_attached[pl_name] = false
                                 if att then att:remove() end
@@ -612,12 +591,9 @@ minetest.register_globalstep(function(dtime)
                     if player then
                         player:set_properties({textures = wormball.player_texture_save[pl_name]})
                         local att = player:get_attach()
-<<<<<<< Updated upstream
-=======
 
                         --minetest.chat_send_all('ln566')
 
->>>>>>> Stashed changes
                         player:set_detach()
                         player_api.player_attached[pl_name] = false
                         if att then att:remove() end
@@ -676,12 +652,9 @@ arena_lib.on_eliminate('wormball', function(arena, p_name)
                 arena_lib.load_celebration('wormball', arena, win_player)
             end,arena,win_player)
             local att = win_player_obj:get_attach()
-<<<<<<< Updated upstream
-=======
 
             --minetest.chat_send_all('ln627')
 
->>>>>>> Stashed changes
             win_player_obj:set_detach()
             player_api.player_attached[win_player] = false
             if att then att:remove() end
@@ -716,13 +689,9 @@ arena_lib.on_disconnect('wormball', function(arena, p_name)
     if player then
         player:set_properties({textures = wormball.player_texture_save[p_name]})
         local att = player:get_attach()
-<<<<<<< Updated upstream
-        player_api.player_attached[p_name] = false
-=======
         --player_api.player_attached[p_name] = false
         --minetest.chat_send_all('ln664')
 
->>>>>>> Stashed changes
         player:set_detach()
         if att then att:remove() end
     end
@@ -750,11 +719,8 @@ arena_lib.on_celebration('wormball', function(arena, winner_name)
         if player then
             player:set_properties({textures = wormball.player_texture_save[pl_name]})
             local att = player:get_attach()
-<<<<<<< Updated upstream
-=======
             --minetest.chat_send_all('ln693')
 
->>>>>>> Stashed changes
             player:set_detach()
             player_api.player_attached[pl_name] = false
             if att then att:remove() end

nodes.lua

@@ -194,22 +194,6 @@ minetest.register_entity('wormball:player_att',{
         
         
     end,
-<<<<<<< Updated upstream
-=======
-    -- on_attach_child = function(self, child)
-    --     if child:is_player() then
-    --         minetest.chat_send_all(child:get_player_name()..' was attached')
-    --     end
-
-    -- end,
-    -- on_detach_child = function(self, child)
-    --     if child:is_player() then
-    --         minetest.chat_send_all(child:get_player_name()..' was detached')
-    --     end
-
-    -- end,
->>>>>>> Stashed changes
- 
 })