diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
index e7194cb6ec..ed13954be8 100644
--- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
@@ -1,6 +1,7 @@
 CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHandler
 	FIELD field_16771 sessionId Ljava/util/UUID;
 	FIELD field_19144 chunkLoadDistance I
+	FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271;
 	FIELD field_3687 random Ljava/util/Random;
 	FIELD field_3688 recipeManager Lnet/minecraft/class_1863;
 	FIELD field_3689 connection Lnet/minecraft/class_2535;
diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
index a82e002ee4..192b61fc84 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2CPacket
-	FIELD field_12278 reducedDebugInfo Z
+	FIELD field_12278 debugWorld Z
 	FIELD field_12279 maxPlayers I
 	FIELD field_12280 playerEntityId I
 	FIELD field_12281 hardcore Z
@@ -7,7 +7,9 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 	FIELD field_12284 dimension Lnet/minecraft/class_2874;
 	FIELD field_19145 chunkLoadDistance I
 	FIELD field_20665 seed J
-	FIELD field_20666 showsDeathScreen Z
+	FIELD field_20666 flatWorld Z
+	FIELD field_24618 reducedDebugInfo Z
+	FIELD field_24619 showDeathScreen Z
 	METHOD <init> (ILnet/minecraft/class_1934;JZLnet/minecraft/class_2874;IIZZZZ)V
 		ARG 1 playerEntityId
 		ARG 2 gameMode
@@ -15,11 +17,18 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C
 		ARG 5 hardcore
 		ARG 6 dimensionType
 		ARG 7 maxPlayers
+		ARG 8 chunkLoadDistance
+		ARG 9 reducedDebugInfo
+		ARG 10 showDeathScreen
+		ARG 11 debugWorld
+		ARG 12 flatWorld
 	METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_11562 hasReducedDebugInfo ()Z
 	METHOD method_11564 getEntityId ()I
 	METHOD method_11565 getDimension ()Lnet/minecraft/class_2874;
-	METHOD method_11568 isHardcore ()Z
+	METHOD method_11568 isFlatWorld ()Z
 	METHOD method_20204 getChunkLoadDistance ()I
 	METHOD method_22423 getSeed ()J
 	METHOD method_22424 showsDeathScreen ()Z
+	METHOD method_28118 isHardcore ()Z
+	METHOD method_28119 isDebugWorld ()Z
diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
index 1db09aed81..99bb86897e 100644
--- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
+++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping
@@ -2,9 +2,18 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespa
 	FIELD field_12431 dimension Lnet/minecraft/class_2874;
 	FIELD field_12434 gameMode Lnet/minecraft/class_1934;
 	FIELD field_20667 sha256Seed J
+	FIELD field_24451 keepPlayerAttributes Z
+	FIELD field_24620 debugWorld Z
+	FIELD field_24621 flatWorld Z
 	METHOD <init> (Lnet/minecraft/class_2874;JLnet/minecraft/class_1934;ZZZ)V
 		ARG 1 dimension
 		ARG 2 sha256Seed
+		ARG 5 debugWorld
+		ARG 6 flatWorld
+		ARG 7 keepPlayerAttributes
 	METHOD method_11779 getDimension ()Lnet/minecraft/class_2874;
 	METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934;
 	METHOD method_22425 getSha256Seed ()J
+	METHOD method_27904 shouldKeepPlayerAttributes ()Z
+	METHOD method_28120 isDebugWorld ()Z
+	METHOD method_28121 isFlatWorld ()Z