diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 97a0b3d0..ff68139c 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -110,6 +110,7 @@ namespace TShockAPI
 					{ PacketTypes.PlayerAnimation, HandlePlayerAnimation },
 					{ PacketTypes.PlayerMana, HandlePlayerMana },
 					{ PacketTypes.PlayerTeam, HandlePlayerTeam },
+					{ PacketTypes.TeamChangeWithSpawnCheck, HandlePlayerTeam },
 					{ PacketTypes.SignRead, HandleSignRead },
 					{ PacketTypes.SignNew, HandleSign },
 					{ PacketTypes.LiquidSet, HandleLiquidSet },
@@ -2751,7 +2752,6 @@ namespace TShockAPI
 
 			if (Main.ServerSideCharacter)
 			{
-
 				// As long as the player has not changed his spawnpoint since initial connection,
 				// we should not use the client's spawnpoint value. This is because the spawnpoint
 				// value is not saved on the client when SSC is enabled. Hence, we have to assert
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index be875b74..73204f4d 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit be875b74c7a2d5dda810b09ccbe139322064ede4
+Subproject commit 73204f4d11fc4f0c9cc4cee7b1d711bd2cc2e080