diff --git a/plugins/scripts/scripts/skybattle.sk b/plugins/scripts/scripts/skybattle.sk
index 6a6afed..118b159 100644
--- a/plugins/scripts/scripts/skybattle.sk
+++ b/plugins/scripts/scripts/skybattle.sk
@@ -243,10 +243,16 @@ command /skybattle_listspawners <number>:
 
 command /spawnteam <number> <number>:
     trigger:
+        set {skybattle::current_arena} to 0
         spawnteam(arg-1, arg-2)
 
 function spawnteam(team: integer, spawner: integer):
     loop entries of team "IDList%{_team}%":
+        broadcast {_team}
+        broadcast {_spawner}
+        broadcast {skybattle::current_arena}
+        if {skybattle::current_arena} is none:
+            teleport loop-value to location at {skybattle::arena%{skybattle::current_arena}%::spawn_location::%{_spawner}%}
         teleport loop-value to location at {skybattle::arena%{skybattle::current_arena}%::spawn_location::%{_spawner}%}
         set loop-value's gamemode to survival