From 5ccf83c182eac4a564eccd16265e1ed24bee54e0 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 27 Nov 2016 21:13:48 +0100 Subject: [PATCH] Fixed Backpacks --- src/me/mrCookieSlime/Slimefun/api/Backpacks.java | 4 ++-- .../Slimefun/listeners/BackpackListener.java | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/api/Backpacks.java b/src/me/mrCookieSlime/Slimefun/api/Backpacks.java index 71e27fc9f..0fad7bcc0 100644 --- a/src/me/mrCookieSlime/Slimefun/api/Backpacks.java +++ b/src/me/mrCookieSlime/Slimefun/api/Backpacks.java @@ -42,7 +42,7 @@ public class Backpacks { if (line.startsWith(ChatColor.translateAlternateColorCodes('&', "&7ID: ")) && line.contains("#")) { try { id = Integer.parseInt(line.split("#")[1]); - uuid = line.split("#")[0].replace("&7ID: ", ""); + uuid = line.split("#")[0].replace(ChatColor.translateAlternateColorCodes('&', "&7ID: "), ""); } catch(NumberFormatException x) { } } @@ -67,7 +67,7 @@ public class Backpacks { if (line.startsWith(ChatColor.translateAlternateColorCodes('&', "&7ID: ")) && line.contains("#")) { try { id = Integer.parseInt(line.split("#")[1]); - uuid = line.split("#")[0].replace("&7ID: ", ""); + uuid = line.split("#")[0].replace(ChatColor.translateAlternateColorCodes('&', "&7ID: "), ""); } catch(NumberFormatException x) { } } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java index d5225cc68..7cf1a08a0 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java @@ -12,6 +12,7 @@ import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.Backpacks; import me.mrCookieSlime.Slimefun.api.Slimefun; +import org.bukkit.ChatColor; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -131,7 +132,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.BACKPACK_SMALL, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 9))); @@ -152,7 +153,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.BACKPACK_MEDIUM, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 18))); @@ -173,7 +174,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.BACKPACK_LARGE, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 27))); @@ -194,7 +195,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.WOVEN_BACKPACK, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 36))); @@ -215,7 +216,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.GILDED_BACKPACK, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 45))); @@ -236,7 +237,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.BOUND_BACKPACK, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 36))); @@ -257,7 +258,7 @@ public class BackpackListener implements Listener { if (Slimefun.hasUnlocked(p, SlimefunItems.COOLER, true)) { if (item.getAmount() == 1) { for (int line = 0; line < item.getItemMeta().getLore().size(); line++) { - if (item.getItemMeta().getLore().get(line).equals("&7ID: ")) { + if (item.getItemMeta().getLore().get(line).equals(ChatColor.translateAlternateColorCodes('&', "&7ID: "))) { ItemMeta im = item.getItemMeta(); List lore = im.getLore(); lore.set(line, lore.get(line).replace("", Backpacks.createBackpack(p, 27)));