From fc0c89553cdce105fdfc46f0ca831128f2637448 Mon Sep 17 00:00:00 2001
From: rubenwardy <rubenwardy@gmail.com>
Date: Fri, 17 Jul 2015 19:26:58 +0100
Subject: [PATCH] Fix team spawn on new player

---
 mods/ctf_match/init.lua | 8 +-------
 mods/ctf_pvp_engine     | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mods/ctf_match/init.lua b/mods/ctf_match/init.lua
index b3ea932..d509b58 100644
--- a/mods/ctf_match/init.lua
+++ b/mods/ctf_match/init.lua
@@ -110,13 +110,7 @@ ctf.register_on_new_game(function()
 			ctf.join(name, team)
 		end
 
-		team = ctf.player(name).team
-		if ctf.team(team) then
-			local spawn = ctf.get_spawn(team)
-			if spawn then
-				player:moveto(spawn, false)
-			end
-		end
+		ctf.move_to_spawn(name)
 
 		if ctf.setting("match.clear_inv") then
 			local inv = player:get_inventory()
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index 17e7a2b..9196eec 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit 17e7a2b529e1a10c866a2b588f0971daf7931946
+Subproject commit 9196eec940eb25ea55b9b95dee729dd66f5ae61b