From 7c89c9ca5020dfeebdddb114fc244826e6736f91 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 2 Mar 2020 12:54:05 +1300 Subject: [PATCH] Send rel look for 1.15 head rotation packet --- .../PacketHandlerHeadRotation.java | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadRotation.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadRotation.java index 0949e2a7..9145dc64 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadRotation.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadRotation.java @@ -24,30 +24,32 @@ public class PacketHandlerHeadRotation implements IPacketHandler { @Override public void handle(Disguise disguise, PacketContainer sentPacket, LibsPackets packets, Player observer, Entity entity) { - if (disguise.getType().isPlayer() && entity.getType() != EntityType.PLAYER) { - Location loc = entity.getLocation(); - - byte pitch = DisguiseUtilities - .getPitch(disguise.getType(), entity.getType(), (byte) (int) (loc.getPitch() * 256.0F / 360.0F)); - byte yaw = DisguiseUtilities.getYaw(disguise.getType(), entity.getType(), sentPacket.getBytes().read(0)); - - PacketContainer rotation = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION); - - StructureModifier mods = rotation.getModifier(); - - mods.write(0, entity.getEntityId()); - mods.write(1, yaw); - - PacketContainer look = new PacketContainer(PacketType.Play.Server.ENTITY_LOOK); - - look.getIntegers().write(0, entity.getEntityId()); - look.getBytes().write(0, yaw); - look.getBytes().write(1, pitch); - - packets.clear(); - - packets.addPacket(look); - packets.addPacket(rotation); + if (!disguise.getType().isPlayer() || entity.getType() == EntityType.PLAYER) { + return; } + + Location loc = entity.getLocation(); + + byte pitch = DisguiseUtilities + .getPitch(disguise.getType(), entity.getType(), (byte) (int) (loc.getPitch() * 256.0F / 360.0F)); + byte yaw = DisguiseUtilities.getYaw(disguise.getType(), entity.getType(), sentPacket.getBytes().read(0)); + + PacketContainer rotation = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION); + + StructureModifier mods = rotation.getModifier(); + + mods.write(0, entity.getEntityId()); + mods.write(1, yaw); + + PacketContainer look = new PacketContainer(PacketType.Play.Server.REL_ENTITY_MOVE_LOOK); + + look.getIntegers().write(0, entity.getEntityId()); + look.getBytes().write(0, yaw); + look.getBytes().write(1, pitch); + + packets.clear(); + + packets.addPacket(look); + packets.addPacket(rotation); } }