Fix crash when client connection is missing in packet

Patbox · Dec 9, 2024 · 18ba37f · 18ba37f
1 parent b3ecdb6
commit 18ba37f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...core/src/main/java/eu/pb4/polymer/core/mixin/block/packet/PalettedContainerDataMixin.java b/...core/src/main/java/eu/pb4/polymer/core/mixin/block/packet/PalettedContainerDataMixin.java
@@ -29,7 +29,7 @@ public abstract class PalettedContainerDataMixin<T> {
         var palette = this.palette();
         if (palette instanceof IdListPalette<T> && palette.get(0) instanceof BlockState) {
             var player = PacketContext.get();
-            if (player.getPacketListener() == null) {
+            if (player.getClientConnection() == null) {
                 return storage;
             }
             int bits;

diff --git a/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/item/ItemStackMixin.java b/polymer-core/src/main/java/eu/pb4/polymer/core/mixin/item/ItemStackMixin.java
@@ -36,7 +36,7 @@ private static Supplier<Codec<ItemStack>> patchCodec(Supplier<Codec<ItemStack>>
         }, content -> { // Encode
             if (PolymerCommonUtils.isServerNetworkingThreadWithContext()) {
                 var ctx = PacketContext.get();
-                if (ctx.getPacketListener() == null) {
+                if (ctx.getBackingPacketListener() == null) {
                     return content;
                 }
                 return PolymerItemUtils.getPolymerItemStack(content, ctx);

diff --git a/polymer-networking/src/main/java/eu/pb4/polymer/networking/api/ContextByteBuf.java b/polymer-networking/src/main/java/eu/pb4/polymer/networking/api/ContextByteBuf.java
@@ -27,7 +27,7 @@ public static ContextByteBuf of(PacketContext context, int version, ByteBuf buf)
 
         if (buf instanceof RegistryByteBuf reg) {
             registryManager = reg.getRegistryManager();
-        } else if (context.getPacketListener() instanceof NetworkHandlerExtension ext) {
+        } else if (context.getBackingPacketListener() instanceof NetworkHandlerExtension ext) {
             registryManager = ext.polymer$getDynamicRegistryManager();
         }
         if (registryManager == null) {