Skip to content

Commit 4cccd8f

Browse files
committed
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2 parents 340b026 + bd1182a commit 4cccd8f

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.embeddedt.modernfix.common.mixin.safety;
2+
3+
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
4+
import net.minecraft.client.renderer.entity.layers.RenderLayer;
5+
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
6+
import org.spongepowered.asm.mixin.Final;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.Mutable;
9+
import org.spongepowered.asm.mixin.Shadow;
10+
import org.spongepowered.asm.mixin.injection.At;
11+
import org.spongepowered.asm.mixin.injection.Inject;
12+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
13+
14+
import java.util.Collections;
15+
import java.util.List;
16+
17+
@Mixin(LivingEntityRenderer.class)
18+
@ClientOnlyMixin
19+
public class LivingEntityRendererMixin {
20+
@Shadow @Final @Mutable
21+
protected List<RenderLayer<?, ?>> layers;
22+
23+
@Inject(method = "<init>", at = @At("RETURN"))
24+
private void synchronizeLayerList(CallbackInfo ci) {
25+
/* allows buggy mods to call addLayer concurrently, order is not deterministic but can't fix that */
26+
this.layers = Collections.synchronizedList(layers);
27+
}
28+
}

common/src/main/java/org/embeddedt/modernfix/duck/IClientNetHandler.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)