mirror of
https://github.com/HibiscusMC/HMCCosmetics.git
synced 2025-12-19 15:09:19 +00:00
fix: passenger packet interceptor appears to cause instability, disabling for now
This commit is contained in:
@@ -122,13 +122,17 @@ public class CosmeticPacketInterface implements PacketInterface {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull PacketAction writePassengerContent(@NotNull Player player, @NotNull PassengerWrapper wrapper) {
|
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);
|
CosmeticUser viewerUser = CosmeticUsers.getUser(player);
|
||||||
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();
|
List<Integer> originalPassengers = wrapper.getPassengers();
|
||||||
|
|
||||||
MessagesUtil.sendDebugMessages("Mount Packet Sent - Read - EntityID: " + ownerId);
|
MessagesUtil.sendDebugMessages("Mount Packet Read - EntityID: " + ownerId);
|
||||||
|
|
||||||
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;
|
||||||
@@ -136,15 +140,13 @@ public class CosmeticPacketInterface implements PacketInterface {
|
|||||||
MessagesUtil.sendDebugMessages("Mount Packet Sent - " + user.getUniqueId());
|
MessagesUtil.sendDebugMessages("Mount Packet Sent - " + user.getUniqueId());
|
||||||
|
|
||||||
if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return PacketAction.NOTHING;
|
if (!user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) return PacketAction.NOTHING;
|
||||||
if (user.getUserBackpackManager() == null) return PacketAction.NOTHING;
|
if (user.getUserBackpackManager() == null) return PacketAction.NOTHING;
|
||||||
|
|
||||||
ArrayList<Integer> passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds());
|
List<Integer> passengers = new ArrayList<>(user.getUserBackpackManager().getEntityManager().getIds());
|
||||||
for (int i : originalPassengers) {
|
passengers.addAll(originalPassengers);
|
||||||
if (passengers.contains(i)) continue; // Prevent same id from being used twice in different places
|
|
||||||
passengers.add(i);
|
|
||||||
}
|
|
||||||
wrapper.setPassengers(passengers);
|
wrapper.setPassengers(passengers);
|
||||||
return PacketAction.CHANGED;
|
return PacketAction.CHANGED;
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user