Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-11-08 19:51:36 +01:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
jascotty2 2019-09-16 09:17:50 -05:00
parent 4be7e3c50b
commit 8ce97e7702
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,11 +276,11 @@ public class Kit {
} }
private boolean giveKit(Player player, Key key) { private boolean giveKit(Player player, Key key) {
if (plugin.getConfig().getBoolean("Main.Prevent The Redeeming of a Kit When Inventory Is Full") && !hasRoom(player)) { if (Settings.NO_REDEEM_WHEN_FULL.getBoolean() && !hasRoom(player)) {
plugin.getLocale().getMessage("event.claim.full").sendPrefixedMessage(player); plugin.getLocale().getMessage("event.claim.full").sendPrefixedMessage(player);
return false; return false;
} }
if (plugin.getConfig().getBoolean("Main.Sounds Enabled") && kitAnimation == KitAnimation.NONE) if (Settings.SOUNDS_ENABLED.getBoolean() && kitAnimation == KitAnimation.NONE)
CompatibleSound.ENTITY_PLAYER_LEVELUP.play(player, 0.6F, 15.0F); CompatibleSound.ENTITY_PLAYER_LEVELUP.play(player, 0.6F, 15.0F);
List<KitItem> innerContents = new ArrayList<>(getContents()); List<KitItem> innerContents = new ArrayList<>(getContents());
@ -353,7 +353,11 @@ public class Kit {
} }
} }
if (!chosenItem) generateRandomItem(innerContents, amtToGive, player, (int) (Math.random() * canChoose)); if (!chosenItem && canChoose != 0 && forceSelect == -1) {
return generateRandomItem(innerContents, amtToGive, player, (int) (Math.random() * canChoose));
} else if (!chosenItem) {
return false;
}
player.updateInventory(); player.updateInventory();
return true; return true;