diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java index 8e407b7c..cda370e0 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java @@ -243,9 +243,9 @@ public class CosmeticCommand implements CommandExecutor { CosmeticUser user = CosmeticUsers.getUser(player); if (user.isInWardrobe()) { - user.leaveWardrobe(); + user.leaveWardrobe(false); } else { - user.enterWardrobe(false, wardrobe); + user.enterWardrobe(wardrobe, false); } return true; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java index adf0b016..2545d5d3 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java @@ -46,7 +46,7 @@ public class WGListener implements Listener { if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) { if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return; Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString()); - user.enterWardrobe(true, wardrobe); + user.enterWardrobe(wardrobe, true); } } } @@ -74,7 +74,7 @@ public class WGListener implements Listener { if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) { if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return; Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString()); - user.enterWardrobe(true, wardrobe); + user.enterWardrobe(wardrobe, true); } } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java index 9cec8163..4c68e0ce 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -111,7 +111,7 @@ public class PlayerGameListener implements Listener { if (!event.isSneaking()) return; if (!user.isInWardrobe()) return; - user.leaveWardrobe(); + user.leaveWardrobe(false); } @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @@ -125,7 +125,7 @@ public class PlayerGameListener implements Listener { } if (user.isInWardrobe()) { - user.leaveWardrobe(); + user.leaveWardrobe(false); } Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> { @@ -202,7 +202,7 @@ public class PlayerGameListener implements Listener { event.setCancelled(true); return; } - if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe(); + if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe(false); } } @@ -345,7 +345,7 @@ public class PlayerGameListener implements Listener { CosmeticUser user = CosmeticUsers.getUser(event.getEntity()); if (user == null) return; - if (user.isInWardrobe()) user.leaveWardrobe(); + if (user.isInWardrobe()) user.leaveWardrobe(false); if (Settings.isUnapplyOnDeath() && !event.getEntity().hasPermission("hmccosmetics.unapplydeath.bypass")) { user.removeCosmetics();