Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2025-03-02 04:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Maybe this too

Browse Source
This commit is contained in:
libraryaddict 2024-07-02 00:15:11 +12:00
parent 3ea2d7a042
commit cd44863106
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java
View File

@ -85,10 +85,9 @@ public class PacketsHandler {
if (handler != null) { if (handler != null) {
handler.handle(disguise, packets, observer, entity); handler.handle(disguise, packets, observer, entity);
return packets; } else {
packets.setUnhandled(true);
} }
packets.setUnhandled(true);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

13
plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java
View File

@ -317,7 +317,14 @@ public class PacketHandlerSpawn implements IPacketHandler {
if (NmsVersion.v1_21_R1.isSupported()) { if (NmsVersion.v1_21_R1.isSupported()) {
Double scale = ((LivingWatcher) disguise.getWatcher()).getScale(); 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<>())); attributes.add(new WrapperPlayServerUpdateAttributes.Property(Attributes.GENERIC_SCALE, scale, new ArrayList<>()));
} }
} }
@ -371,8 +378,10 @@ public class PacketHandlerSpawn implements IPacketHandler {
continue; continue;
} }
// Workaround for this pending fix https://github.com/retrooper/packetevents/issues/869
WrapperPlayServerEntityEquipment packet = new WrapperPlayServerEntityEquipment(disguisedEntity.getEntityId(), 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); packets.addDelayedPacket(packet);
} }