diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddEntityPacket.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddEntityPacket.java
index 83d2a43b..5c9007cd 100644
--- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddEntityPacket.java
+++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddEntityPacket.java
@@ -18,9 +18,9 @@
 @EqualsAndHashCode(doNotUseGetters = true)
 @ToString(doNotUseGetters = true)
 public class AddEntityPacket implements BedrockPacket {
-    private final List<AttributeData> attributes = new ObjectArrayList<>();
-    private final EntityDataMap metadata = new EntityDataMap();
-    private final List<EntityLinkData> entityLinks = new ObjectArrayList<>();
+    private List<AttributeData> attributes = new ObjectArrayList<>();
+    private EntityDataMap metadata = new EntityDataMap();
+    private List<EntityLinkData> entityLinks = new ObjectArrayList<>();
     private long uniqueEntityId;
     private long runtimeEntityId;
     private String identifier;
diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddItemEntityPacket.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddItemEntityPacket.java
index 37b90814..ea5f4721 100644
--- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddItemEntityPacket.java
+++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddItemEntityPacket.java
@@ -12,7 +12,7 @@
 @EqualsAndHashCode(doNotUseGetters = true)
 @ToString(doNotUseGetters = true)
 public class AddItemEntityPacket implements BedrockPacket {
-    private final EntityDataMap metadata = new EntityDataMap();
+    private EntityDataMap metadata = new EntityDataMap();
     private long uniqueEntityId;
     private long runtimeEntityId;
     private ItemData itemInHand;
diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddPlayerPacket.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddPlayerPacket.java
index f2cde8c6..7389593f 100644
--- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddPlayerPacket.java
+++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/AddPlayerPacket.java
@@ -23,8 +23,8 @@
 @EqualsAndHashCode(doNotUseGetters = true)
 @ToString(doNotUseGetters = true)
 public class AddPlayerPacket implements BedrockPacket, PlayerAbilityHolder {
-    private final EntityDataMap metadata = new EntityDataMap();
-    private final List<EntityLinkData> entityLinks = new ObjectArrayList<>();
+    private EntityDataMap metadata = new EntityDataMap();
+    private List<EntityLinkData> entityLinks = new ObjectArrayList<>();
     private UUID uuid;
     private String username;
     private long uniqueEntityId;
@@ -34,7 +34,7 @@ public class AddPlayerPacket implements BedrockPacket, PlayerAbilityHolder {
     private Vector3f motion;
     private Vector3f rotation;
     private ItemData hand;
-    private final AdventureSettingsPacket adventureSettings = new AdventureSettingsPacket();
+    private AdventureSettingsPacket adventureSettings = new AdventureSettingsPacket();
     private String deviceId;
     private int buildPlatform;
     private GameType gameType;
diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/SetEntityDataPacket.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/SetEntityDataPacket.java
index 4eba09c9..137226a7 100644
--- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/SetEntityDataPacket.java
+++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/SetEntityDataPacket.java
@@ -11,13 +11,13 @@
 @EqualsAndHashCode(doNotUseGetters = true)
 @ToString(doNotUseGetters = true)
 public class SetEntityDataPacket implements BedrockPacket {
-    private final EntityDataMap metadata = new EntityDataMap();
+    private EntityDataMap metadata = new EntityDataMap();
     private long runtimeEntityId;
     private long tick;
     /**
      * @since v557
      */
-    private final EntityProperties properties = new EntityProperties();
+    private EntityProperties properties = new EntityProperties();
 
     @Override
     public final PacketSignal handle(BedrockPacketHandler handler) {