From 6c39966fef5842602a9ff3a33e826746a2a52cdd Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Sun, 21 Apr 2019 18:36:21 +0200 Subject: [PATCH 1/2] Fix tridents --- .../java/us/myles/ViaVersion/api/entities/Entity1_13Types.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java index 9c9767214..1dbcb34f9 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java +++ b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java @@ -270,7 +270,8 @@ public class Entity1_13Types { EVOCATION_FANGS(79, EntityType.EVOCATION_FANGS), FISHIHNG_HOOK(90, EntityType.FISHING_BOBBER), SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW), - DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL); + DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL), + TRIDENT(94, EntityType.TRIDENT); private final int id; private final EntityType type; From d7353e01b02d7d5c8725357082c35080b3caf85a Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Sun, 21 Apr 2019 18:52:53 +0200 Subject: [PATCH 2/2] Remove ')' --- .../protocol1_14to1_13_2/packets/EntityPackets.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java index 87295d071..348bcc734 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java @@ -83,12 +83,8 @@ public class EntityPackets { break; } } else if ((type1_14.is(Entity1_14Types.EntityType.ITEM) && data > 0) - || type1_14.is(Entity1_14Types.EntityType.ARROW) - || type1_14.is(Entity1_14Types.EntityType.SPECTRAL_ARROW) - || type1_14.is(Entity1_14Types.EntityType.TRIDENT)) { - if (type1_14.is(Entity1_14Types.EntityType.ARROW) - || type1_14.is(Entity1_14Types.EntityType.SPECTRAL_ARROW) - || type1_14.is(Entity1_14Types.EntityType.TRIDENT))) { // todo check if trident needs it + || type1_14.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ARROW)) { + if (type1_14.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ARROW)) { wrapper.set(Type.INT, 0, data - 1); } // send velocity in separate packet, 1.14 is now ignoring the velocity