From d16a7604665513682d17c915d0448a6e9f331422 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Thu, 7 Nov 2019 18:42:05 +0100 Subject: [PATCH] 19w45a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- .../protocols/protocol1_15to1_14_4/MetadataRewriter.java | 4 +++- .../main/resources/assets/viaversion/data/mapping-1.15.json | 1 - jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 821d9d07c..b40952065 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index b9a66aa06..900d59058 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3a4835d40..fab79ee10 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 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 370a243b1..6fb542419 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(560, "1.15")); + register(v1_15 = new ProtocolVersion(561, "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 13765bf1a..834388217 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 @@ -31,7 +31,9 @@ public class 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 } catch (Exception e) { metadatas.remove(metadata); if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) { diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json index 9e8c7f399..fd9914b59 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json @@ -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", diff --git a/jar/pom.xml b/jar/pom.xml index 0db24e153..72dd80316 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 068bdf881..d5be34e4c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w44a + 2.1.4-19w45a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 0753228cf..289c0ddef 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 61e5c19b1..9ef008379 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 2e3b3398c..8d092c497 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w44a + 2.1.4-19w45a 4.0.0