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' into 'master'

Browse Source 
Fixes

See merge request Songoda/ultimatekits!17
This commit is contained in:
Brianna O'Keefe 2019-04-20 02:17:25 +00:00
commit 74c3ffddcc
4 changed files with 12 additions and 9 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.2.8" version: "2.2.9"
build: build:
stage: build stage: build

9
src/main/java/com/songoda/ultimatekits/gui/GUIDisplayKit.java
View File

@ -74,7 +74,7 @@ public class GUIDisplayKit extends AbstractGUI {
max = 54 - min; max = 54 - min;
if (amt <= 7) { if (amt <= 7) {
max = 27 - min; max = 27 - min;
} else if (amt <= 16) { } else if (amt <= 15) {
max = 36 - min; max = 36 - min;
} else if (amt <= 23) { } else if (amt <= 23) {
max = 45 - min; max = 45 - min;
@ -152,11 +152,10 @@ public class GUIDisplayKit extends AbstractGUI {
for (ItemStack is : list) { for (ItemStack is : list) {
if (!plugin.getConfig().getBoolean("Interfaces.Do Not Use Glass Borders")) { if (!plugin.getConfig().getBoolean("Interfaces.Do Not Use Glass Borders")) {
if (num == 17) if (num == 17 || num == (max - 18)) num++;
num++; if (num == 18 && max == 36) num++;
if (num == (max - 18))
num++;
} }
System.out.println("hit " + num);
ItemMeta meta = is.hasItemMeta() ? is.getItemMeta() : Bukkit.getItemFactory().getItemMeta(is.getType()); ItemMeta meta = is.hasItemMeta() ? is.getItemMeta() : Bukkit.getItemFactory().getItemMeta(is.getType());
ArrayDeque<String> lore; ArrayDeque<String> lore;

9
src/main/java/com/songoda/ultimatekits/gui/GUIKitSelector.java
View File

@ -50,9 +50,9 @@ public class GUIKitSelector extends AbstractGUI {
if (glassless) { if (glassless) {
if (kitList.size() > n + 34) if (kitList.size() > n + 34)
max = max + 34; max = max + 34;
else if (kitList.size() > n + 25) else if (kitList.size() > n + 23)
max = max + 25; max = max + 25;
else if (kitList.size() > n + 16) else if (kitList.size() > n + 14)
max = max + 16; max = max + 16;
else if (kitList.size() > n + 7) else if (kitList.size() > n + 7)
max = max + 7; max = max + 7;
@ -129,7 +129,10 @@ public class GUIKitSelector extends AbstractGUI {
if (!glassless) if (!glassless)
tmax = tmax - 10; tmax = tmax - 10;
for (int index = num; index != tmax; index++) { for (int index = num; index != tmax; index++) {
if (!glassless && index == 17) index = 19; if (!glassless) {
if (num == 17 || num == (max - 18)) num++;
if (num == 18 && max == 36) num++;
}
if (id > kitList.size() - 1) { if (id > kitList.size() - 1) {
inventory.setItem(index, new ItemStack(Material.AIR)); inventory.setItem(index, new ItemStack(Material.AIR));
continue; continue;

1
src/main/resources/en_US.lang
View File

@ -62,6 +62,7 @@ event.claim.wait = "&7Cooldown: &6%time%"
event.claim.noaccess = "&7Cooldown: &cNo Access.." event.claim.noaccess = "&7Cooldown: &cNo Access.."
event.claim.full = "&cYour inventory is too full to claim this kit!" event.claim.full = "&cYour inventory is too full to claim this kit!"
event.create.won = "&7You got a &6%item%&7." event.create.won = "&7You got a &6%item%&7."
event.crate.wrongkey = "&cThis key doesn't belong to this kit.."
event.purchase.cancelled = "&cPurchase Cancelled." event.purchase.cancelled = "&cPurchase Cancelled."
event.key.given = "&9You have received a &a%kit% &9kit key." event.key.given = "&9You have received a &a%kit% &9kit key."
event.key.success = "&9You have successfully redeemed a key for the kit &7%kit%&9." event.key.success = "&9You have successfully redeemed a key for the kit &7%kit%&9."