9
0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-19 15:09:19 +00:00

chore: refactor passenger content code

This commit is contained in:
Logan
2025-09-12 19:31:19 -05:00
parent 0676125f07
commit e76aa0783e

View File

@@ -130,7 +130,6 @@ public class CosmeticPacketInterface implements PacketInterface {
if (viewerUser == null || viewerUser.isInWardrobe()) return PacketAction.NOTHING; if (viewerUser == null || viewerUser.isInWardrobe()) return PacketAction.NOTHING;
int ownerId = wrapper.getOwner(); int ownerId = wrapper.getOwner();
List<Integer> originalPassengers = wrapper.getPassengers();
Optional<CosmeticUser> optionalCosmeticUser = CosmeticUsers.values().stream().filter(user -> user.getPlayer() != null).filter(user -> ownerId == user.getPlayer().getEntityId()).findFirst(); Optional<CosmeticUser> optionalCosmeticUser = CosmeticUsers.values().stream().filter(user -> user.getPlayer() != null).filter(user -> ownerId == user.getPlayer().getEntityId()).findFirst();
if (optionalCosmeticUser.isEmpty()) return PacketAction.NOTHING; if (optionalCosmeticUser.isEmpty()) return PacketAction.NOTHING;
@@ -145,12 +144,9 @@ public class CosmeticPacketInterface implements PacketInterface {
if (user.getUserBackpackManager() == null) return PacketAction.NOTHING; if (user.getUserBackpackManager() == null) return PacketAction.NOTHING;
List<Integer> originalPassengers = wrapper.getPassengers();
List<Integer> passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds()); List<Integer> passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds());
// Prevent duplicates passengers.addAll(originalPassengers);
for (int i : originalPassengers) {
if (passengers.contains(i)) continue;
passengers.add(i);
}
wrapper.setPassengers(passengers); wrapper.setPassengers(passengers);
return PacketAction.CHANGED; return PacketAction.CHANGED;
} }