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

Merge remote-tracking branch 'origin/remapped' into remapped

Browse Source
This commit is contained in:
LoJoSho
2023-02-06 14:54:17 -06:00
parent a7170e09cf c2b4fade42
commit bdb52c0a32
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
View File

@@ -46,7 +46,7 @@ public class CosmeticCommand implements CommandExecutor {
}
CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
Menu menu = Menus.getMenu(Settings.getDefaultMenu());
Menu menu = Menus.getDefaultMenu();
if (user == null) {
MessagesUtil.sendMessage(sender, "invalid-player");

2
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java
View File

@@ -39,6 +39,8 @@ public class Menus {
return MENUS.containsValue(menu);
}
public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
public static List<String> getMenuNames() {
List<String> names = new ArrayList<>();

3
common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
View File

@@ -13,7 +13,6 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
import com.hibiscusmc.hmccosmetics.gui.Menu;
import com.hibiscusmc.hmccosmetics.gui.Menus;
@@ -356,7 +355,7 @@ public class PlayerGameListener implements Listener {
CosmeticUser user = CosmeticUsers.getUser(player);
if (user == null) return;
if (!user.isInWardrobe()) return;
Menu menu = Menus.getMenu(Settings.getDefaultMenu());
Menu menu = Menus.getDefaultMenu();
if (menu == null) return;
menu.openMenu(user);
event.setCancelled(true);