Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-02 12:51:22 +01:00
Code Issues Projects Releases Wiki Activity

merge dev

Browse Source
This commit is contained in:
creeper123123321 2019-11-15 11:35:35 -03:00
commit bd0ce3dd71
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
View File

@ -77,7 +77,7 @@ public class ProtocolVersion {
register(v1_14_2 = new ProtocolVersion(485, "1.14.2"));
register(v1_14_3 = new ProtocolVersion(490, "1.14.3"));
register(v1_14_4 = new ProtocolVersion(498, "1.14.4"));
register(v1_15 = new ProtocolVersion(560, "1.15"));
register(v1_15 = new ProtocolVersion(564, "1.15"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

12
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
View File

@ -37,7 +37,17 @@ public class MetadataRewriter1_15To1_14_4 extends MetadataRewriter {
metadata.setId(metadata.getId() + 1); //TODO is it 11 or 12? what is it for?
}
//TODO new boolean with id 17 for enderman
//NOTES:
//new boolean with id 11 for trident, default = false, added in 19w45a
//new boolean with id 17 for enderman
if (type.isOrHasParent(Entity1_15Types.EntityType.WOLF)) {
if (metadata.getId() == 18) {
metadatas.remove(metadata);
} else if (metadata.getId() > 18) {
metadata.setId(metadata.getId() - 1);
}
}
}
@Override

1
common/src/main/resources/assets/viaversion/data/mapping-1.15.json
View File

@ -13373,7 +13373,6 @@
"entity.parrot.imitate.drowned",
"entity.parrot.imitate.elder_guardian",
"entity.parrot.imitate.ender_dragon",
"entity.parrot.imitate.enderman",
"entity.parrot.imitate.endermite",
"entity.parrot.imitate.evoker",
"entity.parrot.imitate.ghast",