Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-28 21:15:51 +01:00
Code Issues Projects Releases Wiki Activity

Don't add tags if they're already in there

Browse Source
This commit is contained in:
Nassim Jahnke 2024-06-14 17:04:22 +02:00
parent 00088a90fd
commit 524e053327
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/viaversion/viaversion/rewriter/TagRewriter.java
View File

@ -175,8 +175,9 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
} }
public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags, @Nullable Map<String, String> tagsToRename, @Nullable Set<String> tagsToRemove) { public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, @Nullable List<TagData> newTags, @Nullable Map<String, String> tagsToRename, @Nullable Set<String> tagsToRemove) {
int tagsSize = wrapper.read(Types.VAR_INT); final int tagsSize = wrapper.read(Types.VAR_INT);
final List<TagData> tags = new ArrayList<>(newTags != null ? tagsSize + newTags.size() : tagsSize); final List<TagData> tags = new ArrayList<>(newTags != null ? tagsSize + newTags.size() : tagsSize);
final Set<String> currentTags = new HashSet<>(tagsSize);
for (int i = 0; i < tagsSize; i++) { for (int i = 0; i < tagsSize; i++) {
String key = wrapper.read(Types.STRING); String key = wrapper.read(Types.STRING);
@ -202,6 +203,7 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
} }
tags.add(new TagData(key, ids)); tags.add(new TagData(key, ids));
currentTags.add(Key.stripMinecraftNamespace(key));
} }
if (tagsToRemove != null) { if (tagsToRemove != null) {
@ -210,7 +212,11 @@ public class TagRewriter<C extends ClientboundPacketType> implements com.viavers
// Add new tags if present // Add new tags if present
if (newTags != null) { if (newTags != null) {
tags.addAll(newTags); for (final TagData tag : newTags) {
if (!currentTags.contains(Key.stripMinecraftNamespace(tag.identifier()))) {
tags.add(tag);
}
}
} }
// Write the tags // Write the tags