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 ecb8fb7a..57668216 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/packets/CosmeticPacketInterface.java @@ -122,13 +122,17 @@ public class CosmeticPacketInterface implements PacketInterface { @Override public @NotNull PacketAction writePassengerContent(@NotNull Player player, @NotNull PassengerWrapper wrapper) { + 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 + /* CosmeticUser viewerUser = CosmeticUsers.getUser(player); if (viewerUser == null || viewerUser.isInWardrobe()) return PacketAction.NOTHING; int ownerId = wrapper.getOwner(); List originalPassengers = wrapper.getPassengers(); - MessagesUtil.sendDebugMessages("Mount Packet Sent - Read - EntityID: " + ownerId); + MessagesUtil.sendDebugMessages("Mount Packet Read - EntityID: " + ownerId); Optional optionalCosmeticUser = CosmeticUsers.values().stream().filter(user -> user.getPlayer() != null).filter(user -> ownerId == user.getPlayer().getEntityId()).findFirst(); if (optionalCosmeticUser.isEmpty()) return PacketAction.NOTHING; @@ -136,15 +140,13 @@ public class CosmeticPacketInterface implements PacketInterface { MessagesUtil.sendDebugMessages("Mount Packet Sent - " + user.getUniqueId()); if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return PacketAction.NOTHING; - if (user.getUserBackpackManager() == null) return PacketAction.NOTHING; + if (user.getUserBackpackManager() == null) return PacketAction.NOTHING; - ArrayList passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds()); - for (int i : originalPassengers) { - if (passengers.contains(i)) continue; // Prevent same id from being used twice in different places - passengers.add(i); - } + List passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds()); + passengers.addAll(originalPassengers); wrapper.setPassengers(passengers); return PacketAction.CHANGED; + */ } @Override