Upstream
/
UltimateKits
mirror of https://github.com/songoda/UltimateKits.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2019-11-27 20:57:40 -05:00
parent 86b4841e97 f5f4f14d6a
commit 315f08eb8b
2 changed files with 7 additions and 3 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.12"
version: "2.4.13"
build:
stage: build

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

@ -209,13 +209,17 @@ public class Kit {
is.setItemMeta(meta);
}
if (is.getType() == Material.PAPER && ChatColor.stripColor(is.getItemMeta().getDisplayName()).endsWith("Command")) {
if (is.getType() == Material.PAPER && is.getItemMeta().getDisplayName()
.equals(UltimateKits.getInstance().getLocale().getMessage("general.type.command")
.getMessage())) {
StringBuilder command = new StringBuilder();
for (String line : is.getItemMeta().getLore()) {
command.append(line);
}
list.add(new KitItem(is, ChatColor.stripColor(command.toString())));
} else if (is.getType() == Material.PAPER && ChatColor.stripColor(is.getItemMeta().getDisplayName()).endsWith("Money")) {
} else if (is.getType() == Material.PAPER && is.getItemMeta().getDisplayName()
.equals(UltimateKits.getInstance().getLocale().getMessage("general.type.money")
.getMessage())) {
String money = is.getItemMeta().getLore().get(0);
list.add(new KitItem(is, ChatColor.stripColor(money)));
} else {