3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-25 07:40:08 +01:00

Merge pull request #1521 from creeper123123321/abstraction

Merge dev into abstraction
Dieser Commit ist enthalten in:
Myles 2019-11-20 12:58:53 +00:00 committet von GitHub
Commit faaa252fa8
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
4 geänderte Dateien mit 13 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -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"));
}

Datei anzeigen

@ -23,6 +23,7 @@ public class Protocol1_15To1_14_4 extends Protocol {
protected void registerPackets() {
new MetadataRewriter1_15To1_14_4(this);
MappingData.init();
EntityPackets.register(this);
PlayerPackets.register(this);
WorldPackets.register(this);

Datei anzeigen

@ -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

Datei anzeigen

@ -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",