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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-11-17 11:48:08 -05:00
commit 91e6fba149
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "UltimateKits" name: "UltimateKits"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.4.10" version: "2.4.11"
build: build:
stage: build stage: build

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

@ -136,14 +136,15 @@ public class Kit {
return; return;
} }
if (this.delay > 0) { if (this.delay > 0) {
if (getNextUse(player) == -1) { if (getNextUse(player) != 0) {
plugin.getLocale().getMessage("event.claim.nottwice").sendPrefixedMessage(player);
} else if (getNextUse(player) != 0) {
plugin.getLocale().getMessage("event.claim.delay") plugin.getLocale().getMessage("event.claim.delay")
.processPlaceholder("time", Methods.makeReadable(this.getNextUse(player))) .processPlaceholder("time", Methods.makeReadable(this.getNextUse(player)))
.sendPrefixedMessage(player); .sendPrefixedMessage(player);
return; return;
} }
} else if (getNextUse(player) == -1) {
plugin.getLocale().getMessage("event.claim.nottwice").sendPrefixedMessage(player);
return;
} }
if (giveKit(player)) { if (giveKit(player)) {
EconomyManager.withdrawBalance(player, price); EconomyManager.withdrawBalance(player, price);
@ -153,7 +154,6 @@ public class Kit {
plugin.getLocale().getMessage("event.claim.purchasesuccess") plugin.getLocale().getMessage("event.claim.purchasesuccess")
.processPlaceholder("kit", showableName).sendPrefixedMessage(player); .processPlaceholder("kit", showableName).sendPrefixedMessage(player);
} }
} }
public void processGenericUse(Player player, boolean forced) { public void processGenericUse(Player player, boolean forced) {