diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 2692c9340..885791f12 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 1e76f9373..527e889d1 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 7327de616..60b366afd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 10a31a82c..8eebc752b 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -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(562, "1.15")); + register(v1_15 = new ProtocolVersion(563, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/MetadataRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/MetadataRewriter.java index 834388217..43024c8b2 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/MetadataRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/MetadataRewriter.java @@ -34,6 +34,14 @@ public class MetadataRewriter { //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); + } + } } catch (Exception e) { metadatas.remove(metadata); if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) { diff --git a/jar/pom.xml b/jar/pom.xml index ad866f8c6..8f73f1b8f 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index ddeeb5284..1d510ed65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w45b + 2.1.4-19w46a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 389c50f12..7c7b76392 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 2a9fcbef8..6a5d64b4e 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 2bd7c5d67..c8a05d883 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w45b + 2.1.4-19w46a 4.0.0