Skip to content

Commit

Permalink
Fix scaling attribute not working for everyone on 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@libraryaddict
libraryaddict committed Jan 5, 2025
1 parent 29e028f commit 6cc2fb7
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 31 deletions.
14 changes: 12 additions & 2 deletions plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,19 @@ private void adjustSelfDisguiseScale(double prevPersonalDisguiseScaleMax, double
attribute.removeModifier(modifier);
}

AttributeModifier newModifier;

// Subtract 1, as 1 is added internally
attribute.addModifier(new AttributeModifier(DisguiseUtilities.getSelfDisguiseScaleNamespace(), personalPlayerScaleAttribute,
AttributeModifier.Operation.MULTIPLY_SCALAR_1, EquipmentSlotGroup.ANY));
if (NmsVersion.v1_21_R1.isSupported()) {
newModifier = new AttributeModifier(DisguiseUtilities.getSelfDisguiseScaleNamespace(), personalPlayerScaleAttribute,
AttributeModifier.Operation.MULTIPLY_SCALAR_1, EquipmentSlotGroup.ANY);
} else {
newModifier = new AttributeModifier(DisguiseUtilities.getSelfDisguiseScaleUUID(),
DisguiseUtilities.getSelfDisguiseScaleNamespace().asString(), personalPlayerScaleAttribute,
AttributeModifier.Operation.MULTIPLY_SCALAR_1, EquipmentSlotGroup.ANY);
}

attribute.addModifier(newModifier);
}
}

Expand Down
66 changes: 37 additions & 29 deletions plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,11 @@ private static class UsersData {
io.github.retrooper.packetevents.adventure.serializer.gson.GsonComponentSerializer.gson();
@Getter
private static NamespacedKey selfDisguiseScaleNamespace;
/**
* This is for 1.20.6 only, 1.21 introduces a NamespaceKey
*/
@Getter
private static UUID selfDisguiseScaleUUID = UUID.randomUUID();
@Getter
private static Attribute scaleAttribute;
@Getter
Expand Down Expand Up @@ -421,14 +426,21 @@ public static boolean shouldBeHiddenSelfDisguise(ItemStack itemStack) {
return true;
}

public static boolean isDisguisesSelfScalingAttribute(AttributeModifier modifier) {
if (NmsVersion.v1_21_R1.isSupported()) {
return modifier.getKey().equals(getSelfDisguiseScaleNamespace());
}

return modifier.getName().equals(getSelfDisguiseScaleNamespace().asString());
}

public static void removeSelfDisguiseScale(Entity entity) {
if (!NmsVersion.v1_20_R4.isSupported() || isInvalidFile() || !(entity instanceof LivingEntity)) {
return;
}

AttributeInstance attribute = ((LivingEntity) entity).getAttribute(getScaleAttribute());
attribute.getModifiers().stream().filter(a -> a.getKey().equals(DisguiseUtilities.getSelfDisguiseScaleNamespace()))
.forEach(attribute::removeModifier);
attribute.getModifiers().stream().filter(DisguiseUtilities::isDisguisesSelfScalingAttribute).forEach(attribute::removeModifier);
}

public static double getNameSpacing() {
Expand Down Expand Up @@ -552,7 +564,7 @@ private static Vector3d clone(Vector3d vec) {
double height = (disguise.getHeight() + disguise.getWatcher().getNameYModifier());
double heightScale = disguise.getNameHeightScale();
height *= heightScale;
height += (DisguiseUtilities.getNameSpacing() * (heightScale - 1)) * 0.35;
height += (getNameSpacing() * (heightScale - 1)) * 0.35;

for (PacketWrapper packet : packets) {
if (packet instanceof WrapperPlayServerEntityRotation) {
Expand All @@ -566,9 +578,8 @@ private static Vector3d clone(Vector3d vec) {
if (packet instanceof WrapperPlayServerEntityTeleport) {
WrapperPlayServerEntityTeleport tele = (WrapperPlayServerEntityTeleport) packet;

cloned = new WrapperPlayServerEntityTeleport(standId,
tele.getPosition().add(0, height + (DisguiseUtilities.getNameSpacing() * i), 0), tele.getYaw(), tele.getPitch(),
tele.isOnGround());
cloned = new WrapperPlayServerEntityTeleport(standId, tele.getPosition().add(0, height + (getNameSpacing() * i), 0),
tele.getYaw(), tele.getPitch(), tele.isOnGround());
} else if (packet instanceof WrapperPlayServerEntityRelativeMoveAndRotation) {
WrapperPlayServerEntityRelativeMoveAndRotation rot = (WrapperPlayServerEntityRelativeMoveAndRotation) packet;
cloned = new WrapperPlayServerEntityRelativeMoveAndRotation(standId, rot.getDeltaX(), rot.getDeltaY(), rot.getDeltaZ(),
Expand All @@ -580,7 +591,7 @@ private static Vector3d clone(Vector3d vec) {
} else if (packet instanceof WrapperPlayServerEntityPositionSync) {
WrapperPlayServerEntityPositionSync sync = (WrapperPlayServerEntityPositionSync) packet;
EntityPositionData data = clone(sync.getValues());
data.setPosition(data.getPosition().add(0, height + (DisguiseUtilities.getNameSpacing() * i), 0));
data.setPosition(data.getPosition().add(0, height + (getNameSpacing() * i), 0));
cloned = new WrapperPlayServerEntityPositionSync(standId, data, sync.isOnGround());
} else {
// It seems that EntityStatus packet was being added at some point, probably in some other transformation
Expand Down Expand Up @@ -888,15 +899,15 @@ public static void createClonedDisguise(Player player, Entity toClone, Boolean[]
reference = new StringBuilder("@");

for (int i = 0; i < referenceLength; i++) {
reference.append(alphabet[DisguiseUtilities.random.nextInt(alphabet.length)]);
reference.append(alphabet[random.nextInt(alphabet.length)]);
}

if (DisguiseUtilities.getClonedDisguise(reference.toString()) != null) {
if (getClonedDisguise(reference.toString()) != null) {
reference = null;
}
}

if (reference != null && DisguiseUtilities.addClonedDisguise(reference.toString(), disguise)) {
if (reference != null && addClonedDisguise(reference.toString(), disguise)) {
String entityName = DisguiseType.getType(toClone).toReadable();

LibsMsg.MADE_REF.send(player, entityName, reference.toString());
Expand Down Expand Up @@ -1425,7 +1436,7 @@ public static void doBoundingBox(TargetedDisguise disguise) {
if (disguiseScale != null) {
scale = disguiseScale;
} else {
scale = DisguiseUtilities.getEntityScaleWithoutLibsDisguises(disguise.getEntity());
scale = getEntityScaleWithoutLibsDisguises(disguise.getEntity());
}
}

Expand All @@ -1442,7 +1453,7 @@ public static void doBoundingBox(TargetedDisguise disguise) {
}
}

ReflectionManager.setBoundingBox(entity, entityBox, DisguiseUtilities.getEntityScaleWithoutLibsDisguises(disguise.getEntity()));
ReflectionManager.setBoundingBox(entity, entityBox, getEntityScaleWithoutLibsDisguises(disguise.getEntity()));
}
}

Expand Down Expand Up @@ -1612,7 +1623,7 @@ public static UserProfile getProfileFromMojang(final PlayerDisguise disguise) {
}

disguise.setUserProfile(userProfile);
DisguiseUtilities.refreshTrackers(disguise);
refreshTrackers(disguise);
}, DisguiseConfig.isContactMojangServers());
}

Expand Down Expand Up @@ -2008,7 +2019,7 @@ public static void refreshTracker(final TargetedDisguise disguise, String player

Bukkit.getScheduler().scheduleSyncDelayedTask(LibsDisguises.getInstance(), () -> {
try {
DisguiseUtilities.sendSelfDisguise((Player) disguise.getEntity(), disguise);
sendSelfDisguise((Player) disguise.getEntity(), disguise);
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -2122,7 +2133,7 @@ public static void refreshTrackers(final TargetedDisguise disguise) {

Bukkit.getScheduler().scheduleSyncDelayedTask(LibsDisguises.getInstance(), () -> {
try {
DisguiseUtilities.sendSelfDisguise((Player) disguise.getEntity(), disguise);
sendSelfDisguise((Player) disguise.getEntity(), disguise);
} catch (Exception ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -2813,7 +2824,7 @@ public static void sendSelfDisguise(final Player player, final TargetedDisguise
continue;
}

list.add(new Equipment(slot, DisguiseUtilities.fromBukkitItemStack(getSlot(player.getInventory(), getSlot(slot)))));
list.add(new Equipment(slot, fromBukkitItemStack(getSlot(player.getInventory(), getSlot(slot)))));
}

sendSelfPacket(player, new WrapperPlayServerEntityEquipment(player.getEntityId(), list));
Expand Down Expand Up @@ -3317,7 +3328,7 @@ public static void setupFakeDisguise(final Disguise disguise) {
}

// Remove the old disguise, else we have weird disguises around the place
DisguiseUtilities.removeSelfDisguise(disguise);
removeSelfDisguise(disguise);

// If the disguised player can't see themselves. Return
if (!disguise.isSelfDisguiseVisible() || !PacketsManager.isViewDisguisesListenerEnabled() || player.getVehicle() != null) {
Expand Down Expand Up @@ -3454,25 +3465,22 @@ public static float getYaw(DisguiseType disguiseType, float value) {
public static PacketWrapper<?> updateTablistVisibility(Player player, boolean visible) {
if (NmsVersion.v1_19_R2.isSupported()) {
// If visibility is false, and we can't just tell the client to hide it
if (!visible && !DisguiseUtilities.isFancyHiddenTabs()) {
if (!visible && !isFancyHiddenTabs()) {
return new WrapperPlayServerPlayerInfoRemove(player.getUniqueId());
}

WrapperPlayServerPlayerInfoUpdate.PlayerInfo info =
new WrapperPlayServerPlayerInfoUpdate.PlayerInfo(ReflectionManager.getUserProfile(player), visible, player.getPing(),
SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()),
Component.text(DisguiseUtilities.getPlayerListName(player)), null);
SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()), Component.text(getPlayerListName(player)), null);

return new WrapperPlayServerPlayerInfoUpdate(
DisguiseUtilities.isFancyHiddenTabs() ? WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_LISTED :
WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER, info);
return new WrapperPlayServerPlayerInfoUpdate(isFancyHiddenTabs() ? WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_LISTED :
WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER, info);
}

// WrapperPlayServerPlayerInfo is for older than 1.19.3
WrapperPlayServerPlayerInfo.PlayerData playerInfo =
new WrapperPlayServerPlayerInfo.PlayerData(Component.text(DisguiseUtilities.getPlayerListName(player)),
ReflectionManager.getUserProfile(player), SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()),
NmsVersion.v1_17.isSupported() ? player.getPing() : 0);
new WrapperPlayServerPlayerInfo.PlayerData(Component.text(getPlayerListName(player)), ReflectionManager.getUserProfile(player),
SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()), NmsVersion.v1_17.isSupported() ? player.getPing() : 0);

return new WrapperPlayServerPlayerInfo(
visible ? WrapperPlayServerPlayerInfo.Action.ADD_PLAYER : WrapperPlayServerPlayerInfo.Action.REMOVE_PLAYER, playerInfo);
Expand Down Expand Up @@ -3552,11 +3560,11 @@ public static List<PacketWrapper<?>> getNamePackets(Disguise disguise, Player vi
}

Location loc = disguise.getEntity().getLocation();
// Don't need to offset with DisguiseUtilities.getYModifier, because that's a visual offset and not an actual location offset
// Don't need to offset with getYModifier, because that's a visual offset and not an actual location offset
double height = disguise.getHeight() + disguise.getWatcher().getYModifier() + disguise.getWatcher().getNameYModifier();
double heightScale = disguise.getNameHeightScale();
double startingY = loc.getY() + (height * heightScale);
startingY += (DisguiseUtilities.getNameSpacing() * (heightScale - 1)) * 0.35;
startingY += (getNameSpacing() * (heightScale - 1)) * 0.35;
// TODO If we support text display, there will not be any real features unfortunately
// Text Display is too "jumpy" so it'd require the display to be mounted on another entity, which probably means more packets
// than before
Expand Down Expand Up @@ -3675,7 +3683,7 @@ public static double getEntityScaleWithoutLibsDisguises(Entity entity) {
}

for (AttributeModifier modifier : attribute.getModifiers()) {
if (modifier.getKey().equals(getSelfDisguiseScaleNamespace())) {
if (isDisguisesSelfScalingAttribute(modifier)) {
continue;
}

Expand Down

0 comments on commit 6cc2fb7

Please sign in to comment.