diff --git a/spawn.lua b/spawn.lua
index 9cd6ae4..fe66488 100644
--- a/spawn.lua
+++ b/spawn.lua
@@ -13,7 +13,10 @@ minetest.register_chatcommand("spawn", {
 			return false, "Player not found"
 		end
 		if spawn_spawnpos then
-			player:setpos(spawn_spawnpos)
+			if vector.distance(player:get_pos(), spawn_spawnpos) < 48 then
+				return false, "You are already near the spawn, teleporting aborted."
+			end
+			player:set_pos(spawn_spawnpos)
 			return true, "Teleporting to spawn..."
 		else
 			return false, "The spawn point is not set!"
@@ -24,13 +27,13 @@ minetest.register_chatcommand("spawn", {
 minetest.register_chatcommand("setspawn", {
 	params = "",
 	description = "Sets the spawn point to your current position",
-	privs = { server=true },
+	privs = {server = true},
 	func = function(name, param)
 		local player = minetest.get_player_by_name(name)
 		if not player then
 			return false, "Player not found"
 		end
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		local x = pos.x
 		local y = pos.y
 		local z = pos.z