From 65cfd902d2cafb3814d13c0a97ea5011663b3219 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 10 Nov 2022 22:52:34 -0600 Subject: [PATCH] Moved wardrobe check before startup --- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 5 +++++ src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index d0a78092..93286584 100644 --- a/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -1,6 +1,7 @@ package com.hibiscusmc.hmccosmetics.user; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; +import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType; @@ -98,6 +99,10 @@ public class CosmeticUser { } public void enterWardrobe() { + if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation())) { + getPlayer().sendMessage("You are to far away!"); + return; + } wardrobe = new Wardrobe(this); wardrobe.start(); } diff --git a/src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java b/src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java index 0371ab29..b7c4736b 100644 --- a/src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java +++ b/src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java @@ -41,11 +41,6 @@ public class Wardrobe { player.sendMessage("NPC ID " + NPC_ID); player.sendMessage("armorstand id " + ARMORSTAND_ID); - if (!WardrobeSettings.inDistanceOfStatic(player.getLocation())) { - player.sendMessage("You are to far away!"); - return; - } - this.originalGamemode = player.getGameMode(); if (WardrobeSettings.isReturnLastLocation()) { this.exitLocation = player.getLocation().clone();