diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java
deleted file mode 100644
index cfc92448..00000000
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.embeddedt.modernfix.common.mixin.bugfix.packet_leak;
-
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
-import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.duck.IClientNetHandler;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(ClientPacketListener.class)
-@ClientOnlyMixin
-public class ClientPlayNetHandlerMixin {
-    /**
-     * @author embeddedt
-     * @reason allow the other function to track use of the buffer
-     */
-    @Redirect(method = "handleCustomPayload", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/game/ClientboundCustomPayloadPacket;getData()Lnet/minecraft/network/FriendlyByteBuf;"))
-    private FriendlyByteBuf saveCopyForRelease(ClientboundCustomPayloadPacket instance) {
-        return ((IClientNetHandler)instance).getCopiedCustomBuffer();
-    }
-}
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java
new file mode 100644
index 00000000..8e165b7b
--- /dev/null
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java
@@ -0,0 +1,28 @@
+package org.embeddedt.modernfix.common.mixin.safety;
+
+import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.layers.RenderLayer;
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Collections;
+import java.util.List;
+
+@Mixin(LivingEntityRenderer.class)
+@ClientOnlyMixin
+public class LivingEntityRendererMixin {
+    @Shadow @Final @Mutable
+    protected List<RenderLayer<?, ?>> layers;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void synchronizeLayerList(CallbackInfo ci) {
+        /* allows buggy mods to call addLayer concurrently, order is not deterministic but can't fix that */
+        this.layers = Collections.synchronizedList(layers);
+    }
+}
diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IClientNetHandler.java b/common/src/main/java/org/embeddedt/modernfix/duck/IClientNetHandler.java
deleted file mode 100644
index 71b1a0a6..00000000
--- a/common/src/main/java/org/embeddedt/modernfix/duck/IClientNetHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.embeddedt.modernfix.duck;
-
-import net.minecraft.network.FriendlyByteBuf;
-
-public interface IClientNetHandler {
-    FriendlyByteBuf getCopiedCustomBuffer();
-}