Skip to content

Commit 3dfc3bb

Browse files
committed
Actually add properties tag in 1.20.5->1.20.4 item handler
1 parent 69b33dc commit 3dfc3bb

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,16 @@ protected void registerRewrites() {
444444
if (metaIndex == 9) {
445445
// If the color is found first
446446
final Metadata particleData = event.metaAtIndex(11);
447+
final int color = meta.value();
447448
if (particleData == null) {
448-
// Add default particle with data
449-
final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
450-
particle.add(Type.INT, withAlpha(meta.value()));
451-
event.createExtraMeta(new Metadata(10, Types1_20_5.META_TYPES.particleType, particle));
449+
if (color != 0) {
450+
// Add default particle with data
451+
final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
452+
particle.add(Type.INT, withAlpha(color));
453+
event.createExtraMeta(new Metadata(10, Types1_20_5.META_TYPES.particleType, particle));
454+
}
452455
} else {
453-
addColor(particleData, meta.value());
456+
addColor(particleData, color);
454457
}
455458

456459
event.cancel();

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ public StructuredDataConverter(final boolean backupInconvertibleData) {
264264
values.add(propertyTag);
265265
propertiesTag.put(property.name(), values);
266266
}
267+
profileTag.put("Properties", propertiesTag);
267268
});
268269
register(StructuredDataKey.INSTRUMENT, (data, tag) -> {
269270
// Can't do anything with direct values

0 commit comments

Comments
 (0)