diff --git a/src/main/kotlin/club/mcscrims/speedhg/listener/ConnectListener.kt b/src/main/kotlin/club/mcscrims/speedhg/listener/ConnectListener.kt
index e78a23e..e194854 100644
--- a/src/main/kotlin/club/mcscrims/speedhg/listener/ConnectListener.kt
+++ b/src/main/kotlin/club/mcscrims/speedhg/listener/ConnectListener.kt
@@ -7,6 +7,8 @@ import club.mcscrims.speedhg.util.trans
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.title.Title
 import org.bukkit.Bukkit
+import org.bukkit.Location
+import org.bukkit.World
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerJoinEvent
@@ -16,6 +18,17 @@ class ConnectListener : Listener {
 
 	private val plugin = SpeedHG.instance
 
+	private val spawnLocation: Location
+		get()
+		{
+			val world: World = requireNotNull(
+				Bukkit.getWorld( "world" )
+			) { "Spawn world 'world' is not loaded!" }
+
+			val highestY = world.getHighestBlockYAt( 0, 0 ).toDouble()
+			return Location( world, 0.5, highestY + 1.0, 0.5 )
+		}
+
 	@EventHandler
 	fun onJoin(
 		event: PlayerJoinEvent
@@ -31,6 +44,8 @@ class ConnectListener : Listener {
 			return
 		}
 
+		player.teleport( spawnLocation )
+
 		Bukkit.getOnlinePlayers().forEach { p ->
 			p.sendMsg( "game.join", "name" to player.name )
 		}