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

Fix zombie metadata in 1.10->1.11

Browse Source
This commit is contained in:
FlorianMichael 2024-04-21 11:24:20 +02:00
parent 0acaed7c7a
commit b9e92e5c1f
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/metadata/MetadataRewriter1_11To1_10.java
View File

@ -61,8 +61,6 @@ public class MetadataRewriter1_11To1_10 extends EntityRewriter<ClientboundPacket
event.cancel(); event.cancel();
} else if (meta.id() == 15) { } else if (meta.id() == 15) {
meta.setId(14); meta.setId(14);
} else if (meta.id() == 14) {
meta.setId(15);
} }
}); });
@ -110,7 +108,7 @@ public class MetadataRewriter1_11To1_10 extends EntityRewriter<ClientboundPacket
byte data = meta.value(); byte data = meta.value();
// Check invisible | Check small | Check if custom name is empty | Check if custom name visible is true // Check invisible | Check small | Check if custom name is empty | Check if custom name visible is true
if ((data & 0x20) == 0x20 && ((byte) flags.getValue() & 0x01) == 0x01 if ((data & 0x20) == 0x20 && ((byte) flags.getValue() & 0x01) == 0x01
&& !((String) customName.getValue()).isEmpty() && (boolean) customNameVisible.getValue()) { && !((String) customName.getValue()).isEmpty() && (boolean) customNameVisible.getValue()) {
EntityTracker1_11 tracker = tracker(event.user()); EntityTracker1_11 tracker = tracker(event.user());
int entityId = event.entityId(); int entityId = event.entityId();
if (tracker.addHologram(entityId)) { if (tracker.addHologram(entityId)) {

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

@ -376,8 +376,6 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
null null
); );
filter().type(EntityTypes1_20_5.ZOMBIFIED_PIGLIN).removeIndex(19); // TODO Somewhere between 1.8 and 1.11 we most likely have bad handling
filter().type(EntityTypes1_20_5.LIVINGENTITY).index(10).handler((event, meta) -> { filter().type(EntityTypes1_20_5.LIVINGENTITY).index(10).handler((event, meta) -> {
final int effectColor = meta.value(); final int effectColor = meta.value();
final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect")); final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));