From b3a346d5493887120278d7b4d359804825ae8652 Mon Sep 17 00:00:00 2001
From: Nathan Salapat <nathan@nathansalapat.com>
Date: Thu, 5 May 2022 21:31:58 -0500
Subject: [PATCH] fix #24

---
 mods/decals/textures/list.txt   | 89 ---------------------------------
 mods/lobby/player_callbacks.lua |  8 ++-
 2 files changed, 6 insertions(+), 91 deletions(-)
 delete mode 100644 mods/decals/textures/list.txt

diff --git a/mods/decals/textures/list.txt b/mods/decals/textures/list.txt
deleted file mode 100644
index 8d4d2d7..0000000
--- a/mods/decals/textures/list.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-decals_0.png
-decals_1.png
-decals_2.png
-decals_3.png
-decals_4.png
-decals_5.png
-decals_6.png
-decals_7.png
-decals_8.png
-decals_9.png
-decals_a.png
-decals_arrow_angle.png
-decals_arrow_left_turn.png
-decals_arrow_right_turn.png
-decals_arrow_straight.png
-decals_autumn_leaves_1.png
-decals_autumn_leaves_2_crossing.png
-decals_autumn_leaves_2_curved.png
-decals_autumn_leaves_2_straight.png
-decals_autumn_leaves_2_t_junct.png
-decals_blood_splatter_01.png
-decals_blood_splatter_02.png
-decals_blood_splatter_03.png
-decals_blood_splatter_04.png
-decals_blood_splatter_05.png
-decals_blood_splatter_06.png
-decals_blood_splatter_07.png
-decals_blood_splatter_08.png
-decals_blood_splatter_09.png
-decals_blood_splatter_10.png
-decals_blood_splatter_11.png
-decals_b.png
-decals_chest.png
-decals_circle.png
-decals_color_palette.png
-decals_c.png
-decals_crosswalk.png
-decals_diamond.png
-decals_d.png
-decals_e.png
-decals_f.png
-decals_glitter_1.png
-decals_glitter_2.png
-decals_glitter_3.png
-decals_glitter_4.png
-decals_glitter_5.png
-decals_glitter_6.png
-decals_g.png
-decals_hexagon.png
-decals_h.png
-decals_i.png
-decals_j.png
-decals_k.png
-decals_line_corner.png
-decals_line_dashed.png
-decals_line_edge.png
-decals_line_no_passing.png
-decals_line_passing.png
-decals_line_solid.png
-decals_l.png
-decals_m.png
-decals_n.png
-decals_octagon.png
-decals_o.png
-decals_pattern_diamond.png
-decals_pattern_greek_1.png
-decals_pattern_greek_2.png
-decals_pattern_greek_3.png
-decals_pattern_greek_4.png
-decals_pattern_lily.png
-decals_pattern_lily_small.png
-decals_p.png
-decals_q.png
-decals_r.png
-decals_s.png
-decals_square.png
-decals_star_5.png
-decals_star_6.png
-decals_tire_skid_01.png
-decals_tire_skid_02.png
-decals_t.png
-decals_triangle.png
-decals_u.png
-decals_v.png
-decals_w.png
-decals_x.png
-decals_y.png
-decals_z.png
-list.txt
diff --git a/mods/lobby/player_callbacks.lua b/mods/lobby/player_callbacks.lua
index f978286..272c0c0 100644
--- a/mods/lobby/player_callbacks.lua
+++ b/mods/lobby/player_callbacks.lua
@@ -103,8 +103,12 @@ minetest.register_on_respawnplayer(function(player)
       minetest.chat_send_player(name, 'Immortallity has ended.')
    end)
    if map_id ~= 'lobby' and mode == 'ghost' then
-      player:set_pos(pos)
-      return true
+      if lobby.map[map_id] > 1 then
+         player:set_pos(pos)
+         return true
+      else
+         player:set_pos(lobby.spawn_pos)
+      end
    elseif mode == 'builder' then
       player:set_pos(pos)
       return true