Skip to content

Fix tag updating in 1.21.6->1.21.5 #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
florianreuth wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −28
Open

Fix tag updating in 1.21.6->1.21.5 #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
797607b
Fix tag updating in 1.21.6->1.21.5
florianreuth Jun 14, 2026
bf2eada
Remove unused methods
florianreuth Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions ...ain/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ public Protocol1_21_6To1_21_5() {
protected void registerPackets() {
super.registerPackets();

replaceClientbound(ClientboundPackets1_21_6.UPDATE_TAGS, this::updateTags);
replaceClientbound(ClientboundConfigurationPackets1_21_6.UPDATE_TAGS, this::updateTags);

appendClientbound(ClientboundPackets1_21_6.SOUND, wrapper -> {
wrapper.passthrough(Types.VAR_INT); // Source
fixSoundSource(wrapper);
Expand Down Expand Up @@ -238,34 +241,24 @@ private void fixSoundSource(final PacketWrapper wrapper) {
}

private void updateTags(final PacketWrapper wrapper) {
tagRewriter.handleGeneric(wrapper);
wrapper.resetReader();

// Store dialog tags; then call the normal rewriter which will remove them before sending to the client
final RegistryAndTags registryAndTags = wrapper.user().get(RegistryAndTags.class);
final int length = wrapper.passthrough(Types.VAR_INT);
for (int i = 0; i < length; i++) {
final String registryKey = wrapper.read(Types.STRING);
final String registryKey = wrapper.passthrough(Types.STRING);
final boolean dialog = "dialog".equals(Key.stripMinecraftNamespace(registryKey));
if (dialog) {
final int tagsSize = wrapper.read(Types.VAR_INT);
for (int j = 0; j < tagsSize; j++) {
final String key = wrapper.read(Types.STRING);
final int[] ids = wrapper.read(Types.VAR_INT_ARRAY_PRIMITIVE);
final int tagsSize = wrapper.passthrough(Types.VAR_INT);
for (int j = 0; j < tagsSize; j++) {
final String key = wrapper.passthrough(Types.STRING);
final int[] ids = wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
if (dialog) {
registryAndTags.storeTags(key, ids);
}
} else {
wrapper.write(Types.STRING, registryKey); // Write back
final int tagsSize = wrapper.passthrough(Types.VAR_INT);
for (int j = 0; j < tagsSize; j++) {
wrapper.passthrough(Types.STRING);
wrapper.passthrough(Types.VAR_INT_ARRAY_PRIMITIVE);
}
}
}

if (registryAndTags.tagsSent()) {
wrapper.set(Types.VAR_INT, 0, length - 1); // Dialog tags have been read, remove from size
}
wrapper.resetReader();
tagRewriter.handleGeneric(wrapper);
}

private void clearDialog(final PacketWrapper wrapper) {
Expand Down
10 changes: 1 addition & 9 deletions ...in/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/storage/RegistryAndTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,15 @@ public CompoundTag fromRegistry(final String key) {
return dialogs.get(Key.stripMinecraftNamespace(key));
}

public boolean tagsSent() {
return dialogTags != null && !dialogTags.isEmpty();
}

public void storeTags(final String key, final int[] ids) {
if (dialogTags == null) {
dialogTags = new Object2ObjectArrayMap<>();
}
dialogTags.put(Key.stripMinecraftNamespace(key), ids);
}

public int[] fromKey(final String key) {
return dialogTags.get(Key.stripMinecraftNamespace(key));
}

public CompoundTag[] fromRegistryKey(final String key) {
final int[] ids = fromKey(key);
final int[] ids = dialogTags.get(Key.stripMinecraftNamespace(key));
if (ids == null) {
return null;
}
Expand Down