diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java index 3b65edf0..a8667e52 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java @@ -12,9 +12,10 @@ public class ActionCosmeticShow extends Action { @Override public void run(@NotNull CosmeticUser user, String raw) { - if (user.getHidden()) { - if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG - user.showCosmetics(); - } + if (!user.getHidden()) return; + + // Do not hide if it's already off for WG + if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; + user.showCosmetics(); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java index 60587785..89b30c08 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java @@ -17,6 +17,7 @@ public class ActionCosmeticToggle extends Action { user.showCosmetics(); return; } + user.hideCosmetics(CosmeticUser.HiddenReason.ACTION); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java index a0a303b9..37558d1e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionEquip.java @@ -14,9 +14,8 @@ public class ActionEquip extends Action { @Override public void run(CosmeticUser user, String raw) { Cosmetic cosmetic = Cosmetics.getCosmetic(raw); - if (cosmetic == null) { - return; - } + if (cosmetic == null) return; + user.addPlayerCosmetic(cosmetic); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java index 8a51513b..a6083a9b 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMenu.java @@ -22,10 +22,12 @@ public class ActionMenu extends Action { raw = raw.replaceAll("-o", ""); ignorePermission = true; } + if (!Menus.hasMenu(raw)) { HMCCosmeticsPlugin.getInstance().getLogger().info("Invalid Action Menu -> " + raw); return; } + Menu menu = Menus.getMenu(raw); HMCCosmeticsPlugin.getInstance().getLogger().info(raw + " | " + ignorePermission); menu.openMenu(user, ignorePermission); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java index 374eeb97..0cda96e9 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java @@ -29,10 +29,9 @@ public class ActionParticle extends Action { MessagesUtil.sendDebugMessages("The particle " + rawString[0] + " does not exist!"); return; } - boolean multi = false; - if (particleType.multi() != null) { - multi = true; // Should work? - } + + // Should work? + boolean multi = particleType.multi() != null; var particle = multi ? particleType.multi() : particleType.single(); if (particle instanceof DestinationParticle || particle instanceof BlockDataParticle @@ -40,6 +39,7 @@ public class ActionParticle extends Action { MessagesUtil.sendDebugMessages("The particle " + rawString[0] + " is not supported by this action!"); return; } + particle = ServerUtils.addParticleValues(particle, rawString); Location location = user.getPlayer().getLocation(); for (Player player : PacketManager.getViewers(location)) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java index b328400f..10401eaa 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionUnequip.java @@ -13,9 +13,8 @@ public class ActionUnequip extends Action { @Override public void run(CosmeticUser user, String raw) { - if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) { - return; - } + if (!EnumUtils.isValidEnum(CosmeticSlot.class, raw)) return; + CosmeticSlot slot = CosmeticSlot.valueOf(raw); user.removeCosmeticSlot(slot); }