fix readItemStack 1.13-1.13.1

Elytrium · Nov 28, 2024 · 7203919 · 7203919
1 parent d123b13
commit 7203919
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/tablist/RewritingTabList.java b/plugin/src/main/java/net/elytrium/limboapi/injection/tablist/RewritingTabList.java
@@ -38,6 +38,7 @@ default TabListEntry rewriteEntry(TabListEntry entry) {
         .tabList(entry.getTabList())
         .profile(new GameProfile(this.rewriteUuid(profileId), profile.getName(), profile.getProperties()))
         .chatSession(entry.getChatSession())
+        .displayName(entry.getDisplayNameComponent().orElse(null))
         .latency(entry.getLatency())
         .gameMode(entry.getGameMode())
         .listed(entry.isListed())

diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java
@@ -383,7 +383,7 @@ private static void write17(ByteBuf out, ByteBuf data) {
     }
   }
 
-  // In <=1.12.2 are still block entities, while on higher versions it's just blockstates
+  // In <=1.12.2 flower pots are still block entities, while on higher versions it's just blockstates
   public static List<VirtualBlockEntity.Entry> getAdditionalFlowerPots(ChunkSnapshot chunk) {
     List<VirtualBlockEntity.Entry> flowerPots = null;
     VirtualBlockEntity flowerPot = null;

diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/util/LimboProtocolUtils.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/util/LimboProtocolUtils.java
@@ -559,6 +559,11 @@ public static ItemStack readItemStack(ByteBuf buf, ProtocolVersion version, bool
       return buf.readBoolean()
           ? new ItemStack(ProtocolUtils.readVarInt(buf), buf.readByte(), LimboProtocolUtils.readCompoundTagOrNull(buf, version))
           : LimboProtocolUtils.emptyItemStack(allowEmpty);
+    } else if (version.noLessThan(ProtocolVersion.MINECRAFT_1_13)) {
+      short material = buf.readShort();
+      return material >= 0
+          ? new ItemStack(material, buf.readByte(), LimboProtocolUtils.readCompoundTagOrNull(buf, version))
+          : LimboProtocolUtils.emptyItemStack(allowEmpty);
     } else {
       short material = buf.readShort();
       return material >= 0