Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-30 20:39:13 +00:00
Code Issues Releases Activity

clean: remove players list, just use permissions if you wish to limit it to a certain group.

Browse Source
This commit is contained in:
LoJoSho
2023-05-23 10:53:37 -05:00
parent 54e8e5102a
commit 7c95d9614d
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java
View File

@@ -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<String> players;
private WardrobeLocation location;
public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance, @Nullable List<String> 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<String> getPlayers() {
return players;
}
public int getDistance() {
return distance;
}

3
common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java
View File

@@ -137,9 +137,8 @@ public class WardrobeSettings {
List<String> 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);

4
common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
View File

@@ -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;