Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore invalid names in the data component for hover events as well

This commit is contained in:
Nassim Jahnke 2024-04-26 10:01:29 +02:00
parent 8e63fd635b
commit a1c182f291
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -1203,10 +1203,15 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
private void updateProfile(final StructuredDataContainer data, final Tag skullOwnerTag) {
if (skullOwnerTag instanceof StringTag) {
final String name = ((StringTag) skullOwnerTag).getValue();
data.set(StructuredDataKey.PROFILE, new GameProfile(name, null, EMPTY_PROPERTIES));
if (isValidName(name)) {
data.set(StructuredDataKey.PROFILE, new GameProfile(name, null, EMPTY_PROPERTIES));
}
} else if (skullOwnerTag instanceof CompoundTag) {
final CompoundTag skullOwner = (CompoundTag) skullOwnerTag;
final String name = skullOwner.getString("Name", "");
String name = skullOwner.getString("Name", "");
if (!isValidName(name)) {
name = null;
}
final IntArrayTag idTag = skullOwner.getIntArrayTag("Id");
UUID uuid = null;
@ -1219,7 +1224,8 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
if (propertiesTag != null) {
updateProperties(propertiesTag, properties);
}
data.set(StructuredDataKey.PROFILE, new GameProfile(limit(name, 16), uuid, properties.toArray(EMPTY_PROPERTIES)));
data.set(StructuredDataKey.PROFILE, new GameProfile(name, uuid, properties.toArray(EMPTY_PROPERTIES)));
}
}
@ -1440,7 +1446,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
tag.put("profile", profileTag);
final String name = skullOwnerTag.getString("Name");
if (name != null && name.length() <= 16 && name.indexOf(' ') == -1) { // Ignore invalid names
if (name != null && isValidName(name)) {
profileTag.putString("name", name);
}
@ -1481,4 +1487,20 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
profileTag.put("properties", propertiesListTag);
}
private boolean isValidName(final String name) {
// Ignore invalid player profile names
if (name.length() > 16) {
return false;
}
for (int i = 0, len = name.length(); i < len; ++i) {
final char c = name.charAt(i);
if (c < '!' || c > '~') {
return false;
}
}
return true;
}
}

4
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
View File

@ -167,7 +167,9 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
@Override
protected void handleHoverEvent(final UserConnection connection, final CompoundTag hoverEventTag) {
final StringTag actionTag = hoverEventTag.getStringTag("action");
if (actionTag == null) return;
if (actionTag == null) {
return;
}
if (actionTag.getValue().equals("show_item")) {
final Tag valueTag = hoverEventTag.remove("value");