Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2025-02-16 19:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Fixed sorting.

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-12-31 16:32:01 -05:00
parent bd08fd4572
commit c14aba8829
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/songoda/ultimatekits/kit/Kit.java
View File

@ -273,17 +273,20 @@ public class Kit {
}
}
public void givePartKit(Player player, Key key) {
private void givePartKit(Player player, Key key) {
try {
List<KitItem> innerContents = new ArrayList<>(getContents());
Collections.shuffle(innerContents);
int amt = innerContents.size();
int amtToGive = key == null ? amt : key.getAmt();
if (amt != amtToGive)
Collections.shuffle(innerContents);
CrateAnimateTask task = null;
int num = 0;
for (KitItem item : innerContents) {
for (int i = 0; i < innerContents.size(); i ++) {
KitItem item = innerContents.get(i);
if (amtToGive == 0) continue;
int ch = item.getChance() == 0 ? 100 : item.getChance();
double rand = Math.random() * 100;
@ -313,14 +316,13 @@ public class Kit {
if (kitAnimation != KitAnimation.NONE) {
final CrateAnimateTask cTask = new CrateAnimateTask(plugin, player, this, item.getItem());
task = cTask;
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, cTask::start, 140 * num);
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, cTask::start, 140 * i);
} else {
Map<Integer, ItemStack> overfilled = player.getInventory().addItem(item.getItem());
for (ItemStack item2 : overfilled.values()) {
player.getWorld().dropItemNaturally(player.getLocation(), item2);
}
}
num++;
}
}
if (task != null) {

2
src/main/java/com/songoda/ultimatekits/utils/gui/AbstractGUI.java
View File

@ -112,7 +112,7 @@ public abstract class AbstractGUI implements Listener {
listenersInitialized = true;
}
protected void init(String title, int slots) {
public void init(String title, int slots) {
if (inventory == null
|| inventory.getSize() != slots
|| ChatColor.translateAlternateColorCodes('&', title) != inventory.getTitle()) {