diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
index 45145a2..2e60ba0 100644
--- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
+++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
@@ -59,7 +59,7 @@ protected void registerPackets() {
         this.registerClientbound(ClientboundPackets3D_Shareware.CHUNK_DATA, wrapper -> {
             final ChunkCenterTracker3D_Shareware entityTracker = wrapper.user().get(ChunkCenterTracker3D_Shareware.class);
 
-            final Chunk chunk = wrapper.passthrough(new ChunkType1_14());
+            final Chunk chunk = wrapper.passthrough(ChunkType1_14.TYPE);
             final int diffX = Math.abs(entityTracker.getChunkCenterX() - chunk.getX());
             final int diffZ = Math.abs(entityTracker.getChunkCenterZ() - chunk.getZ());
 
diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/BlockItemPackets20w14infinite.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/BlockItemPackets20w14infinite.java
index f30263e..be3d5e1 100644
--- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/BlockItemPackets20w14infinite.java
+++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/BlockItemPackets20w14infinite.java
@@ -73,8 +73,8 @@ public void register() {
             @Override
             public void register() {
                 handler(wrapper -> {
-                    Chunk chunk = wrapper.read(new ChunkType1_15());
-                    wrapper.write(new ChunkType1_16(), chunk);
+                    Chunk chunk = wrapper.read(ChunkType1_15.TYPE);
+                    wrapper.write(ChunkType1_16.TYPE, chunk);
 
                     chunk.setIgnoreOldLightData(chunk.isFullChunk());