From 3843a28804c99aaf7b86bb4fb064b371eb82bee9 Mon Sep 17 00:00:00 2001 From: Logan <37521985+LoJoSho@users.noreply.github.com> Date: Sun, 7 Sep 2025 14:51:36 -0500 Subject: [PATCH] feat: reenable passenger packet listener --- .../cosmetic/types/CosmeticBackpackType.java | 11 ++++++++++- .../hmccosmetics/packets/CosmeticPacketInterface.java | 6 ++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java index a8474995..909c38bd 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java @@ -13,7 +13,6 @@ import org.bukkit.Location; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; @@ -83,6 +82,16 @@ public class CosmeticBackpackType extends Cosmetic { List owner = List.of(user.getPlayer()); ArrayList particleCloud = backpackManager.getAreaEffectEntityId(); + /* + // Was playing around with an alternative way to handle the backpacks with it all being one long passenger list, + // however, that does not work, it's just a really up there backpack + areaCloud.add(user.getUserBackpackManager().getFirstArmorStandId()); + int[] passengers = areaCloud + .stream() + .mapToInt(Integer::intValue) + .toArray(); + PacketManager.sendRidingPacket(entity.getEntityId(), passengers, owner); + */ for (int i = 0; i < particleCloud.size(); i++) { if (i == 0) { HMCCPacketManager.sendRidingPacket(entity.getEntityId(), particleCloud.get(i), owner); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java index f93c1f91..65954ae7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java @@ -124,10 +124,9 @@ public class CosmeticPacketInterface implements PacketInterface { @Override public @NotNull PacketAction writePassengerContent(@NotNull Player player, @NotNull PassengerWrapper wrapper) { - return PacketAction.NOTHING; + //return PacketAction.NOTHING; // TODO: Figure out what to do with this, because with it in, it ruins backpacks (they keep getting thrown to random locations). - // When you have this all disabled, it works better - /* + // Appears to work fine atm? CosmeticUser viewerUser = CosmeticUsers.getUser(player); if (viewerUser == null || viewerUser.isInWardrobe()) return PacketAction.NOTHING; @@ -148,7 +147,6 @@ public class CosmeticPacketInterface implements PacketInterface { passengers.addAll(originalPassengers); wrapper.setPassengers(passengers); return PacketAction.CHANGED; - */ } @Override