From 11f26f8f0ac89e60b84841c27a80038854047547 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 25 Jul 2023 19:12:46 -0500 Subject: [PATCH] fix: first-person backpacks not showing properly in wardrobes --- .../hmccosmetics/cosmetic/types/CosmeticBackpackType.java | 4 +--- .../hmccosmetics/user/manager/UserWardrobeManager.java | 1 + 2 files changed, 2 insertions(+), 3 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 32adc172..8f6069f5 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 @@ -57,7 +57,7 @@ public class CosmeticBackpackType extends Cosmetic { user.getUserBackpackManager().getArmorStand().setRotation(loc.getYaw(), loc.getPitch()); List outsideViewers = user.getUserBackpackManager().getCloudManager().refreshViewers(loc); - if (isFirstPersonCompadible()) { + if (!user.isInWardrobe() && isFirstPersonCompadible()) { List owner = List.of(user.getPlayer()); ArrayList particleCloud = user.getUserBackpackManager().getAreaEffectEntityId(); @@ -67,11 +67,9 @@ public class CosmeticBackpackType extends Cosmetic { } else { PacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner); } - MessagesUtil.sendDebugMessages("num: " + i + " / valid? "); } PacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner); NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner); - MessagesUtil.sendDebugMessages("ParticleCloud: " + particleCloud.toString()); } PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java index 2bc69d68..12ea3ea1 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java @@ -114,6 +114,7 @@ public class UserWardrobeManager { // Misc if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) { user.getUserBackpackManager().getArmorStand().teleport(npcLocation.clone().add(0, 2, 0)); + NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(user.getCosmetic(CosmeticSlot.BACKPACK)), viewer); PacketManager.ridingMountPacket(NPC_ID, user.getUserBackpackManager().getFirstArmorStandId(), viewer); }