diff --git a/paper/run/server.properties b/paper/run/server.properties index cc8435bbb..c547ab7b5 100644 --- a/paper/run/server.properties +++ b/paper/run/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Tue Mar 05 21:13:54 EST 2024 +#Fri Mar 08 12:37:41 GMT-03:00 2024 enable-jmx-monitoring=false rcon.port=25575 level-seed= diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java index 7ff69856d..804346dd3 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java +++ b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java @@ -62,6 +62,7 @@ public static class CrateAdminListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CrateAdminMenu holder)) return; event.setCancelled(true); diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java index 29c2c9afc..28fad1ff5 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java +++ b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateMainMenu.java @@ -126,26 +126,26 @@ public InventoryBuilder build() { if (slot > getSize()) continue; - slot--; - - String name = file.getString(path + "Name", path + "Name is missing in " + crate.getName() + ".yml"); - - inventory.setItem(slot, new ItemBuilder() - .setTarget(getPlayer()) - .setMaterial(file.getString(path + "Item", "CHEST")) - .setName(name) - .setLore(file.getStringList(path + "Lore")) - .setCrateName(crate.getName()) - .setPlayerName(file.getString(path + "Player")) - .setGlow(file.getBoolean(path + "Glowing")) - .addLorePlaceholder("%Keys%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getVirtualKeys(getPlayer().getUniqueId(), crate.getName()))) - .addLorePlaceholder("%Keys_Physical%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getPhysicalKeys(getPlayer().getUniqueId(), crate.getName()))) - .addLorePlaceholder("%Keys_Total%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getTotalKeys(getPlayer().getUniqueId(), crate.getName()))) - .addLorePlaceholder("%crate_opened%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getCrateOpened(getPlayer().getUniqueId(), crate.getName()))) - .addLorePlaceholder("%Player%", getPlayer().getName()) - .build()); - } + slot--; + + String name = file.getString(path + "Name", path + "Name is missing in " + crate.getName() + ".yml"); + + inventory.setItem(slot, new ItemBuilder() + .setTarget(getPlayer()) + .setMaterial(file.getString(path + "Item", "CHEST")) + .setName(name) + .setLore(file.getStringList(path + "Lore")) + .setCrateName(crate.getName()) + .setPlayerName(file.getString(path + "Player")) + .setGlow(file.getBoolean(path + "Glowing")) + .addLorePlaceholder("%Keys%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getVirtualKeys(getPlayer().getUniqueId(), crate.getName()))) + .addLorePlaceholder("%Keys_Physical%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getPhysicalKeys(getPlayer().getUniqueId(), crate.getName()))) + .addLorePlaceholder("%Keys_Total%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getTotalKeys(getPlayer().getUniqueId(), crate.getName()))) + .addLorePlaceholder("%crate_opened%", NumberFormat.getNumberInstance().format(this.crazyHandler.getUserManager().getCrateOpened(getPlayer().getUniqueId(), crate.getName()))) + .addLorePlaceholder("%Player%", getPlayer().getName()) + .build()); } + } return this; } @@ -182,6 +182,7 @@ public static class CrateMenuListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CrateMainMenu holder)) return; event.setCancelled(true); diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CratePreviewMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CratePreviewMenu.java index a9c0e9533..a8e8401e1 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CratePreviewMenu.java +++ b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CratePreviewMenu.java @@ -147,6 +147,7 @@ public static class CratePreviewListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CratePreviewMenu holder)) return; event.setCancelled(true); @@ -169,7 +170,7 @@ public void onInventoryClick(InventoryClickEvent event) { if (this.inventoryManager.inCratePreview(player)) { if (holder.overrideMenu()) return; - crate.playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + crate.playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); if (crate.getCrateType() == CrateType.casino || crate.getCrateType() == CrateType.cosmic) { player.openInventory(crate.getTierPreview(player)); @@ -190,7 +191,7 @@ public void onInventoryClick(InventoryClickEvent event) { if (container.has(PersistentKeys.next_button.getNamespacedKey())) { // Clicked the next button. if (this.inventoryManager.getPage(player) < crate.getMaxPage()) { - crate.playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + crate.playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); this.inventoryManager.nextPage(player); @@ -202,7 +203,7 @@ public void onInventoryClick(InventoryClickEvent event) { if (container.has(PersistentKeys.back_button.getNamespacedKey())) { // Clicked the back button. if (this.inventoryManager.getPage(player) > 1 && this.inventoryManager.getPage(player) <= crate.getMaxPage()) { - crate.playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + crate.playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); this.inventoryManager.backPage(player); diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateTierMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateTierMenu.java index e049507f1..425973741 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateTierMenu.java +++ b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateTierMenu.java @@ -84,6 +84,7 @@ public static class CrateTierListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CrateTierMenu holder)) return; event.setCancelled(true); diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java index decc9ae0f..5a8bd7b53 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java +++ b/paper/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java @@ -53,7 +53,7 @@ public void onWorldLoad(WorldLoadEvent event) { this.plugin.debug(() -> "Fixed " + finalFixedAmount + " broken crate locations.", Level.WARNING); if (this.crateManager.getBrokeLocations().isEmpty()) { - this.plugin.getLogger().warning("All broken crate locations have been fixed."); + this.plugin.debug(() -> "All broken crate locations have been fixed.", Level.WARNING); } } } \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java index 15e8966b0..c76f7f987 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java +++ b/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java @@ -88,7 +88,8 @@ public void onInventoryClose(InventoryCloseEvent event) { } // Play sound. - if (playSound) holder.getCrate().playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); + if (playSound) + holder.getCrate().playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); // Remove opening stuff. this.crateManager.removePlayerFromOpeningList(player); @@ -109,6 +110,7 @@ public void onInventoryClickPrize(InventoryClickEvent event) { // Get the inventory. Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CratePrizeMenu holder)) return; Player player = holder.getPlayer(); @@ -161,7 +163,7 @@ public void onInventoryClickPrize(InventoryClickEvent event) { event.setCurrentItem(prize.getDisplayItem(player)); - holder.getCrate().playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + holder.getCrate().playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); if (prize.useFireworks()) MiscUtils.spawnFirework(player.getLocation().add(0, 1, 0), null); } @@ -171,6 +173,7 @@ public void onInventoryClick(InventoryClickEvent event) { // Get the inventory. Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CratePrizeMenu holder)) return; Player player = holder.getPlayer(); @@ -212,7 +215,7 @@ public void onInventoryClick(InventoryClickEvent event) { int totalPrizes = cosmicCrateManager.getTotalPrizes(); // Get picked slot. - int pickedSlot = slot+1; + int pickedSlot = slot + 1; // Get clicked item's item meta. ItemMeta itemMeta = itemStack.getItemMeta(); @@ -247,7 +250,7 @@ public void onInventoryClick(InventoryClickEvent event) { cosmicCrateManager.addPickedPrize(player, slot, crate.getTier(tierName)); // Play a sound to indicate they clicked a chest. - holder.getCrate().playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + holder.getCrate().playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); } } else if (container.has(PersistentKeys.cosmic_picked_crate.getNamespacedKey())) { // Gets the tier name from the pdc. @@ -271,7 +274,7 @@ public void onInventoryClick(InventoryClickEvent event) { cosmicCrateManager.removePickedPrize(player, slot); // Play a sound to indicate they clicked a chest. - holder.getCrate().playSound(player, player.getLocation(), "click-sound","UI_BUTTON_CLICK", SoundCategory.PLAYERS); + holder.getCrate().playSound(player, player.getLocation(), "click-sound", "UI_BUTTON_CLICK", SoundCategory.PLAYERS); } // Get the crate name. diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java index 482400b88..df8f1889f 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java +++ b/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java @@ -33,6 +33,7 @@ public class WarCrateListener implements Listener { public void onInventoryClick(InventoryClickEvent event) { Inventory inventory = event.getInventory(); + if (inventory.getHolder() == null) return; if (!(inventory.getHolder(false) instanceof CratePrizeMenu holder)) return; Player player = holder.getPlayer();