diff --git a/gradle.properties b/gradle.properties
index 8becf5e..bd69588 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,9 @@ mod_version = 1.0.0
 org.gradle.jvmargs = -Xmx1G
 
 # Versions
-minecraft_version = 1.21.4
-yarn_mappings = 1.21.4+build.8
+minecraft_version = 1.21.5
+yarn_mappings = 1.21.5+build.1
 loader_version = 0.16.14
-fabric_version = 0.119.2+1.21.4
+fabric_version = 0.124.0+1.21.5
 
-plasmid_version = 0.6.3+1.21.4
\ No newline at end of file
+plasmid_version = 0.6.4+1.21.5
\ No newline at end of file
diff --git a/src/main/java/io/github/haykam821/volleyball/entity/HittableEntity.java b/src/main/java/io/github/haykam821/volleyball/entity/HittableEntity.java
index 3566924..43c0ecd 100644
--- a/src/main/java/io/github/haykam821/volleyball/entity/HittableEntity.java
+++ b/src/main/java/io/github/haykam821/volleyball/entity/HittableEntity.java
@@ -1,6 +1,5 @@
 package io.github.haykam821.volleyball.entity;
 
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.stream.Stream;
 
@@ -201,11 +200,6 @@ public void equipStack(EquipmentSlot slot, ItemStack stack) {
 		return;
 	}
 
-	@Override
-	public Iterable<ItemStack> getArmorItems() {
-		return Collections.emptySet();
-	}
-
 	@Override
 	public ItemStack getEquippedStack(EquipmentSlot slot) {
 		return ItemStack.EMPTY;
diff --git a/src/main/java/io/github/haykam821/volleyball/game/map/VolleyballMap.java b/src/main/java/io/github/haykam821/volleyball/game/map/VolleyballMap.java
index 0076822..e384060 100644
--- a/src/main/java/io/github/haykam821/volleyball/game/map/VolleyballMap.java
+++ b/src/main/java/io/github/haykam821/volleyball/game/map/VolleyballMap.java
@@ -37,7 +37,7 @@ public Vec3d getWaitingSpawnPos() {
 	}
 
 	public float getWaitingSpawnYaw() {
-		return this.waitingSpawn.getData().getFloat(FACING_KEY);
+		return this.waitingSpawn.getData().getFloat(FACING_KEY, 0);
 	}
 
 	public void spawnAtWaiting(ServerWorld world, Entity entity) {
diff --git a/src/main/java/io/github/haykam821/volleyball/game/player/team/TeamEntry.java b/src/main/java/io/github/haykam821/volleyball/game/player/team/TeamEntry.java
index d8193be..2a64257 100644
--- a/src/main/java/io/github/haykam821/volleyball/game/player/team/TeamEntry.java
+++ b/src/main/java/io/github/haykam821/volleyball/game/player/team/TeamEntry.java
@@ -51,7 +51,7 @@ public TemplateRegion getArea() {
 	// Utilities
 	public void spawn(ServerWorld world, ServerPlayerEntity player) {
 		Vec3d spawnPos = this.spawn.getBounds().centerBottom();
-		float yaw = this.spawn.getData().getFloat(VolleyballMap.FACING_KEY);
+		float yaw = this.spawn.getData().getFloat(VolleyballMap.FACING_KEY, 0);
 	
 		player.teleport(world, spawnPos.getX(), spawnPos.getY(), spawnPos.getZ(), Set.of(), yaw, 0, true);
 	}