diff --git a/src/main/java/io/github/haykam821/microbattle/game/kit/RespawnerKit.java b/src/main/java/io/github/haykam821/microbattle/game/kit/RespawnerKit.java
index 88301b7..4314241 100644
--- a/src/main/java/io/github/haykam821/microbattle/game/kit/RespawnerKit.java
+++ b/src/main/java/io/github/haykam821/microbattle/game/kit/RespawnerKit.java
@@ -10,6 +10,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
@@ -116,16 +117,20 @@ public ActionResult attemptRespawn() {
 		}
 
 		// Reset state
-		entry.getPlayer().setHealth(entry.getPlayer().getMaxHealth());
-		entry.getPlayer().getHungerManager().setFoodLevel(20);
-		entry.getPlayer().extinguish();
-		entry.getPlayer().getDamageTracker().update();
-		entry.getPlayer().fallDistance = 0;
+		ServerPlayerEntity player = this.entry.getPlayer();
+
+		player.setHealth(player.getMaxHealth());
+		player.getHungerManager().setFoodLevel(20);
+		player.setAir(player.getMaxAir());
+
+		player.extinguish();
+		player.getDamageTracker().update();
+		player.fallDistance = 0;
 
 		// Teleport and spawn
 		Vec3d spawn = this.getRespawnAroundPos(respawnPos);
-		entry.getPlayer().teleport(world, spawn.getX(), spawn.getY(), spawn.getZ(), 0, 0);;
-		entry.getKit().reinitialize();
+		player.teleport(world, spawn.getX(), spawn.getY(), spawn.getZ(), 0, 0);
+		this.entry.getKit().reinitialize();
 
 		return ActionResult.SUCCESS;
 	}