Merge pull request #1677 from KennyTV/abstraction

20w11a
This commit is contained in:
Myles 2020-03-11 21:29:29 +00:00 committed by GitHub
commit 4b9d3e34ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17341 additions and 17300 deletions

View File

@ -80,7 +80,7 @@ public class ProtocolVersion {
register(v1_15 = new ProtocolVersion(573, "1.15"));
register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
register(v1_16 = new ProtocolVersion(705, "1.16"));
register(v1_16 = new ProtocolVersion(706, "1.16"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

View File

@ -32,11 +32,17 @@ public class MetadataRewriter1_16To1_15_2 extends MetadataRewriter {
if (type == null) return;
if (type.is(Entity1_16Types.EntityType.AREA_EFFECT_CLOUD)) {
if (type == Entity1_16Types.EntityType.AREA_EFFECT_CLOUD) {
if (metadata.getId() == 10) {
Particle particle = (Particle) metadata.getValue();
particle.setId(WorldPackets.getNewParticleId(particle.getId()));
}
} else if (type.isOrHasParent(Entity1_16Types.EntityType.ABSTRACT_ARROW)) {
if (metadata.getId() == 8) {
metadatas.remove(metadata);
} else if (metadata.getId() > 8) {
metadata.setId(metadata.getId() - 1);
}
}
}