From b3b2ec5978a1ffbecc430b4b9bd8e6c55fa9892f Mon Sep 17 00:00:00 2001
From: VoidAngel <Jessicuhh13@gmail.com>
Date: Mon, 30 Apr 2018 18:00:37 -0700
Subject: [PATCH] Fixes a bug where mobs could pick up altar probe items

---
 .../Slimefun/listeners/ItemPickupListener.java              | 6 ++++--
 .../Slimefun/listeners/ItemPickupListener_1_12.java         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java
index dd8336186..d25ceeda6 100644
--- a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java
+++ b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java
@@ -1,6 +1,8 @@
 package me.mrCookieSlime.Slimefun.listeners;
 
 import me.mrCookieSlime.Slimefun.SlimefunStartup;
+
+import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryPickupItemEvent;
@@ -20,7 +22,7 @@ public class ItemPickupListener implements Listener {
     @EventHandler
     public void onPickup(PlayerPickupItemEvent e) {
         if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
-        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
+        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
             e.setCancelled(true);
             e.getItem().remove();
         }
@@ -29,7 +31,7 @@ public class ItemPickupListener implements Listener {
     @EventHandler
     public void onMinecartPickup(InventoryPickupItemEvent e) {
         if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
-        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
+        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
             e.setCancelled(true);
             e.getItem().remove();
         }
diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener_1_12.java b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener_1_12.java
index 644b3be05..ab5243d6a 100644
--- a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener_1_12.java
+++ b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener_1_12.java
@@ -1,6 +1,8 @@
 package me.mrCookieSlime.Slimefun.listeners;
 
 import me.mrCookieSlime.Slimefun.SlimefunStartup;
+
+import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
@@ -22,7 +24,7 @@ public class ItemPickupListener_1_12 implements Listener {
     @EventHandler
     public void onPickup(EntityPickupItemEvent e) {
         if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
-        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
+        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
             e.setCancelled(true);
             e.getItem().remove();
         }
@@ -31,7 +33,7 @@ public class ItemPickupListener_1_12 implements Listener {
     @EventHandler
     public void onMinecartPickup(InventoryPickupItemEvent e) {
         if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
-        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
+        else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
             e.setCancelled(true);
             e.getItem().remove();
         }