Merge branch 'main' into update

ArmaRealms · Feb 12, 2024 · 40b0f4c · 40b0f4c
2 parents cd5ef77 + c67fb90
commit 40b0f4c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java b/paper/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java
@@ -3,6 +3,7 @@
 import com.badbones69.crazycrates.api.enums.PersistentKeys;
 import com.badbones69.crazycrates.api.objects.other.ItemBuilder;
 import com.badbones69.crazycrates.api.utils.MiscUtils;
+import org.apache.commons.lang.WordUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
@@ -25,11 +26,11 @@ public class Prize {
 
     private List<String> permissions = new ArrayList<>();
     private ItemBuilder displayItem = new ItemBuilder();
-    private List<String> commands = new ArrayList<>();
-    private List<String> messages = new ArrayList<>();
+    private final List<String> commands;
+    private final List<String> messages;
     private boolean firework = false;
     private String crateName = "";
-    private String prizeName = "";
+    private final String prizeName;
     private ItemStack itemStack;
     private int maxRange = 100;
     private final String prizeNumber;
@@ -58,13 +59,11 @@ public Prize(ConfigurationSection section, List<Tier> tierPrizes, String crateNa
 
         this.builders = ItemBuilder.convertStringList(this.section.getStringList("Items"), this.prizeNumber);
 
-        this.displayItem = display();
-
         this.tiers = tierPrizes;
 
         this.alternativePrize = alternativePrize;
 
-        this.prizeName = section.getString("DisplayName", "&4Name not found.exe!");
+        this.prizeName = section.getString("DisplayName", WordUtils.capitalizeFully(section.getString("DisplayItem", "STONE").replaceAll("_", " ")));
         this.maxRange = section.getInt("MaxRange", 100);
         this.chance = section.getInt("Chance", 100);
         this.firework = section.getBoolean("Firework", false);
@@ -77,6 +76,8 @@ public Prize(ConfigurationSection section, List<Tier> tierPrizes, String crateNa
         if (!this.permissions.isEmpty()) {
             this.permissions.replaceAll(String::toLowerCase);
         }
+
+        this.displayItem = display();
     }
 
     /**

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
@@ -90,6 +90,8 @@ public void run() {
                                         public void run() {
                                             if (crateManager.hasCrateTask(player)) crateManager.endCrate(player);
 
+                                            crateManager.removePlayerFromOpeningList(player);
+
                                             player.closeInventory();
                                         }
                                     }.runTaskLater(plugin, 30));

diff --git a/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java b/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java
@@ -20,6 +20,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.apache.commons.lang.WordUtils;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Entity;
@@ -129,7 +130,7 @@ public void reloadCrate(Crate crate) {
                             boolean isEnabled = alternativeSection.getBoolean("Toggle");
 
                             if (isEnabled) {
-                                alternativePrize = new Prize(prizeSection.getString("DisplayName", "&4Name not found.exe!"), prizeSection.getName(), alternativeSection);
+                                alternativePrize = new Prize(prizeSection.getString("DisplayName", WordUtils.capitalizeFully(prizeSection.getString("DisplayItem", "STONE").replaceAll("_", " "))), prizeSection.getName(), alternativeSection);
                             }
                         }
 
@@ -249,7 +250,7 @@ public void loadCrates() {
                                 boolean isEnabled = alternativeSection.getBoolean("Toggle");
 
                                 if (isEnabled) {
-                                    alternativePrize = new Prize(prizeSection.getString("DisplayName", "&4Name not found.exe!"), prizeSection.getName(), alternativeSection);
+                                    alternativePrize = new Prize(prizeSection.getString("DisplayName", WordUtils.capitalizeFully(prizeSection.getString("DisplayItem", "STONE").replaceAll("_", " "))), prizeSection.getName(), alternativeSection);
                                 }
                             }