diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java index b01fea44..6cea4aa2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java @@ -4,22 +4,19 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.Location; import javax.annotation.Nullable; -import java.util.List; public class Wardrobe { private String id; private int distance = WardrobeSettings.getDefaultDistance(); private String permission; - private List players; private WardrobeLocation location; - public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance, @Nullable List players) { + public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance) { this.id = id; this.location = location; if (permission != null) this.permission = permission; if (distance != -1) this.distance = distance; - if (players != null) this.players = players; } public String getId() { @@ -33,15 +30,6 @@ public class Wardrobe { public boolean hasPermission() { return permission != null; } - - public boolean hasPlayers() { - return players != null; - } - - public List getPlayers() { - return players; - } - public int getDistance() { return distance; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java index a25f0bd3..85ecb9d6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java @@ -137,9 +137,8 @@ public class WardrobeSettings { List playerNames = null; if (!wardrobesNode.node("permission").virtual()) permission = wardrobesNode.node("permission").getString(); if (!wardrobesNode.node("int").virtual()) distance = wardrobesNode.node("int").getInt(); - if (!wardrobesNode.node("players").virtual()) playerNames = wardrobesNode.node("players").getList(String.class); - Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance, playerNames); + Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance); wardrobes.put(id, wardrobe); } catch (Exception e) { MessagesUtil.sendDebugMessages("Unable to create wardrobe " + id, Level.SEVERE); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index b3c8aa19..5f9add77 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -245,10 +245,6 @@ public class CosmeticUser { } public void enterWardrobe(boolean ignoreDistance, Wardrobe wardrobe) { - if (wardrobe.hasPlayers() && !wardrobe.getPlayers().contains(getPlayer().getName())) { - MessagesUtil.sendMessage(getPlayer(), "wardrobe-not-included"); - return; - } if (wardrobe.hasPermission() && !getPlayer().hasPermission(wardrobe.getPermission())) { MessagesUtil.sendMessage(getPlayer(), "no-permission"); return;