From cd44863106f20de3779025ece6ae9581c093e75f Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 2 Jul 2024 00:15:11 +1200 Subject: [PATCH] Maybe this too --- .../disguise/utilities/packets/PacketsHandler.java | 5 ++--- .../packets/packethandlers/PacketHandlerSpawn.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java index f630c9a5..2c48b454 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java @@ -85,10 +85,9 @@ public class PacketsHandler { if (handler != null) { handler.handle(disguise, packets, observer, entity); - return packets; + } else { + packets.setUnhandled(true); } - - packets.setUnhandled(true); } catch (Exception e) { e.printStackTrace(); } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java index 1d72004d..fc612188 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java @@ -317,7 +317,14 @@ public class PacketHandlerSpawn implements IPacketHandler { if (NmsVersion.v1_21_R1.isSupported()) { Double scale = ((LivingWatcher) disguise.getWatcher()).getScale(); - if (scale != null) { + if (observer == disguisedEntity && DisguiseConfig.isTallSelfDisguisesScaling()) { + if (scale == null) { + scale = DisguiseUtilities.getActualEntityScale(observer); + } + + attributes.add(new WrapperPlayServerUpdateAttributes.Property(Attributes.GENERIC_SCALE, + Math.min(disguise.getSelfDisguiseTallScaleMax(), scale), new ArrayList<>())); + } else if (scale != null) { attributes.add(new WrapperPlayServerUpdateAttributes.Property(Attributes.GENERIC_SCALE, scale, new ArrayList<>())); } } @@ -371,8 +378,10 @@ public class PacketHandlerSpawn implements IPacketHandler { continue; } + // Workaround for this pending fix https://github.com/retrooper/packetevents/issues/869 WrapperPlayServerEntityEquipment packet = new WrapperPlayServerEntityEquipment(disguisedEntity.getEntityId(), - Collections.singletonList(new Equipment(slot, SpigotConversionUtil.fromBukkitItemStack(itemToSend)))); + Collections.singletonList( + new Equipment(slot, DisguiseUtilities.stripEnchants(SpigotConversionUtil.fromBukkitItemStack(itemToSend))))); packets.addDelayedPacket(packet); }