diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 0b12f94b4..6ca316f2a 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 75320896d..3a8fd3567 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 514951258..479d5bf03 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 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 317d9f934..4e156c956 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(555, "1.15")); + register(v1_15 = new ProtocolVersion(556, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java index fb877e5e2..2483cb29e 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java @@ -1,6 +1,7 @@ package us.myles.ViaVersion.protocols.protocol1_14to1_13_2.metadata; import us.myles.ViaVersion.api.PacketWrapper; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.entities.Entity1_14Types; import us.myles.ViaVersion.api.entities.EntityType; @@ -43,6 +44,12 @@ public class MetadataRewriter1_14To1_13_2 extends MetadataRewriter 5) { metadata.setId(metadata.getId() + 1); } + if (metadata.getId() == 8 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) { + final float v = ((Number) metadata.getValue()).floatValue(); + if (Float.isNaN(v) && Via.getConfig().is1_14HealthNaNFix()) { + metadata.setValue(1F); + } + } //Metadata 12 added to living_entity if (metadata.getId() > 11 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) { diff --git a/jar/pom.xml b/jar/pom.xml index a65389d51..f36b49d54 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 02dfd6418..980ec6275 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w38b + 2.1.4-19w39a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index a15ad9820..f87ca79ed 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 976ad19b8..3861228c6 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 4595e9ebb..8e96035e1 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w38b + 2.1.4-19w39a 4.0.0