Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-11-23 10:45:57 +01:00
Code Issues Projects Releases Wiki Activity

make recursive selection less recursive

Browse Source
This commit is contained in:
jascotty2 2019-09-16 09:13:11 -05:00
parent 98525b9367
commit 4be7e3c50b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,14 +290,15 @@ public class Kit {
if (amt != amtToGive || kitAnimation != KitAnimation.NONE) if (amt != amtToGive || kitAnimation != KitAnimation.NONE)
Collections.shuffle(innerContents); Collections.shuffle(innerContents);
return generateRandomItem(innerContents, amtToGive, player); return generateRandomItem(innerContents, amtToGive, player, -1);
} }
private boolean generateRandomItem(List<KitItem> innerContents, int amtToGive, Player player) { private boolean generateRandomItem(List<KitItem> innerContents, int amtToGive, Player player, int forceSelect) {
boolean chosenItem = false; boolean chosenItem = false;
int canChoose = 0;
for (KitItem item : innerContents) { for (KitItem item : innerContents) {
if (amtToGive == 0) continue; if (amtToGive == 0) continue;
int ch = item.getChance() == 0 ? 100 : item.getChance(); int ch = canChoose++ == forceSelect || item.getChance() == 0 ? 100 : item.getChance();
double rand = Math.random() * 100; double rand = Math.random() * 100;
if (rand - ch < 0 || ch == 100) { if (rand - ch < 0 || ch == 100) {
chosenItem = true; chosenItem = true;
@ -352,7 +353,7 @@ public class Kit {
} }
} }
if (!chosenItem) generateRandomItem(innerContents, amtToGive, player); if (!chosenItem) generateRandomItem(innerContents, amtToGive, player, (int) (Math.random() * canChoose));
player.updateInventory(); player.updateInventory();
return true; return true;