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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-30 21:10:23 -04:00
commit f7eb3b91f0
3 changed files with 8 additions and 1 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:
name: "UltimateKits"
path: "/builds/$CI_PROJECT_PATH"
version: "2.4.6"
version: "2.4.7"
build:
stage: build

1
src/main/java/com/songoda/ultimatekits/UltimateKits.java
View File

@ -108,6 +108,7 @@ public class UltimateKits extends SongodaPlugin {
// load kits
dataFile.load();
keyFile.load();
checkKeyDefaults();
loadKits();
keyFile.saveChanges();

6
src/main/java/com/songoda/ultimatekits/commands/CommandKit.java
View File

@ -44,6 +44,12 @@ public class CommandKit extends AbstractCommand {
if (!(sender instanceof Player))
return ReturnType.NEEDS_PLAYER;
if (!kit.hasPermission((Player)sender)) {
instance.getLocale().getMessage("command.general.noperms").sendPrefixedMessage(sender);
return ReturnType.FAILURE;
}
kit.processGenericUse((Player) sender, false);
return ReturnType.SUCCESS;
} else if (args.length == 2) {