From 8ddde7065b291895d22f8c28c1c7c3d2a0f55b19 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Thu, 7 Dec 2023 01:46:28 +0100 Subject: [PATCH] Prefix field with viaFabricPlus$ --- .../fixes/minecraft/network/MixinCustomPayloadS2CPacket.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinCustomPayloadS2CPacket.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinCustomPayloadS2CPacket.java index 237628fb..34003efa 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinCustomPayloadS2CPacket.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinCustomPayloadS2CPacket.java @@ -40,7 +40,7 @@ import java.util.Map; public abstract class MixinCustomPayloadS2CPacket { @Unique - private static final Map PAYLOAD_DIFF = ImmutableMap.builder() + private static final Map viaFabricPlus$PAYLOAD_DIFF = ImmutableMap.builder() .put(BrandCustomPayload.ID, VersionEnum.c0_0_15a_1) .put(DebugGameTestAddMarkerCustomPayload.ID, VersionEnum.r1_14) .put(DebugGameTestClearCustomPayload.ID, VersionEnum.r1_14) @@ -49,7 +49,7 @@ public abstract class MixinCustomPayloadS2CPacket { @Redirect(method = "readPayload", at = @At(value = "INVOKE", target = "Ljava/util/Map;get(Ljava/lang/Object;)Ljava/lang/Object;", remap = false)) private static Object filterAllowedCustomPayloads(Map instance, Object identifier) { if (instance.containsKey(identifier)) { - if (!PAYLOAD_DIFF.containsKey(identifier) || ProtocolHack.getTargetVersion().isOlderThan(PAYLOAD_DIFF.get(identifier))) { + if (!viaFabricPlus$PAYLOAD_DIFF.containsKey(identifier) || ProtocolHack.getTargetVersion().isOlderThan(viaFabricPlus$PAYLOAD_DIFF.get(identifier))) { return null; }