From d94ed9b53a9f030b413ac259dcd2e5bf6ff79f90 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 11 Jul 2021 04:42:33 +1200 Subject: [PATCH] Fix #591 --- .../disguise/utilities/listeners/PlayerSkinHandler.java | 4 ++-- .../utilities/packets/packethandlers/PacketHandlerSpawn.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java b/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java index 6a70fd37..b0056dd6 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java @@ -274,7 +274,7 @@ public class PlayerSkinHandler implements Listener { PacketContainer teleport = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT); StructureModifier mods = teleport.getModifier(); - Location loc = disguise.getEntity().getLocation().add(0, disguise.getWatcher().getYModifier(), 0); + Location loc = disguise.getEntity().getLocation().add(0, disguise.getWatcher().getYModifier() + DisguiseUtilities.getYModifier(disguise), 0); Float pitchLock = DisguiseConfig.isMovementPacketsEnabled() ? disguise.getWatcher().getPitchLock() : null; Float yawLock = DisguiseConfig.isMovementPacketsEnabled() ? disguise.getWatcher().getYawLock() : null; @@ -303,7 +303,7 @@ public class PlayerSkinHandler implements Listener { mods.write(0, id); mods.write(1, loc.getX()); - mods.write(2, loc.getY() + DisguiseUtilities.getYModifier(disguise)); + mods.write(2, loc.getY()); mods.write(3, loc.getZ()); mods.write(4, yaw); mods.write(5, pitch); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java index 173ee54a..fca9a6f5 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java @@ -180,8 +180,7 @@ public class PacketHandlerSpawn implements IPacketHandler { skin.setSleepPackets(!normalPlayerDisguise); - Location spawnAt = normalPlayerDisguise ? disguisedEntity.getLocation() : - observer.getLocation().add(observer.getLocation().getDirection().normalize().multiply(10)); + Location spawnAt = normalPlayerDisguise ? loc : observer.getLocation().add(observer.getLocation().getDirection().normalize().multiply(10)); // Spawn him in front of the observer StructureModifier doubles = spawnPlayer.getDoubles();