From 1eea0360a5dd1cd22948613880bd33a1ca3c84b4 Mon Sep 17 00:00:00 2001 From: AkmalFairuz Date: Fri, 10 Jan 2025 20:12:29 +0700 Subject: [PATCH] Fix FullContainerName --- legacyver/proto/container.go | 2 +- legacyver/proto/item_stack.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/legacyver/proto/container.go b/legacyver/proto/container.go index 87f88ba..e45475c 100644 --- a/legacyver/proto/container.go +++ b/legacyver/proto/container.go @@ -28,7 +28,7 @@ func (x *FullContainerName) Marshal(r protocol.IO) { r.Uint8(&x.ContainerID) if IsProtoGTE(r, ID729) { protocol.OptionalFunc(r, &x.DynamicContainerID, r.Uint32) - } else { + } else if IsProtoGTE(r, 712) { dynamicContainerID, _ := x.DynamicContainerID.Value() r.Uint32(&dynamicContainerID) if dynamicContainerID != 0 { diff --git a/legacyver/proto/item_stack.go b/legacyver/proto/item_stack.go index 8e946fa..ac8cded 100644 --- a/legacyver/proto/item_stack.go +++ b/legacyver/proto/item_stack.go @@ -1044,13 +1044,7 @@ func (x *StackRequestSlotInfo) FromLatest(y protocol.StackRequestSlotInfo) Stack // StackReqSlotInfo reads/writes a StackRequestSlotInfo x using IO r. func StackReqSlotInfo(r protocol.IO, x *StackRequestSlotInfo) { - if IsProtoGTE(r, ID712) { - protocol.Single(r, &x.Container) - } else { - containerID := x.Container.ContainerID - r.Uint8(&containerID) - x.Container.ContainerID = containerID - } + protocol.Single(r, &x.Container) r.Uint8(&x.Slot) r.Varint32(&x.StackNetworkID) }