From 8a267cad3e3046b93fa2117b828dd325f9db3448 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Sun, 12 Jan 2020 13:14:41 +0100
Subject: [PATCH] Fixes #1364

---
 CHANGELOG.md                                     |  1 +
 .../Slimefun/Objects/SlimefunItem/Talisman.java  | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 982e0edd8..274cc5def 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 * Fixed Localization mistakes
 * Fixed #1366
 * Fixed GitHub cache
+* Fixed #1364
 
 ## Release Candidate 4 (06 Jan 2020)
 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java
index be16feec4..f8fe5e0e6 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Talisman.java
@@ -13,6 +13,7 @@ import org.bukkit.event.enchantment.EnchantItemEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityEvent;
 import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 
@@ -135,14 +136,14 @@ public class Talisman extends SlimefunItem {
 
         if (p.getInventory().containsAtLeast(talisman.getItem(), 1)) {
             if (Slimefun.hasUnlocked(p, talisman.getItem(), true)) {
-                executeTalismanAttributes(e,p,talisman);
+                activateTalisman(e, p, p.getInventory(), talisman);
                 return true;
             } 
             else return false;
         } 
         else if (p.getEnderChest().containsAtLeast(talisman.upgrade(), 1)) {
             if (Slimefun.hasUnlocked(p, talisman.upgrade(), true)) {
-                executeTalismanAttributes(e,p,talisman);
+                activateTalisman(e, p, p.getEnderChest(), talisman);
                 return true;
             } 
             else return false;
@@ -150,8 +151,8 @@ public class Talisman extends SlimefunItem {
         else return false;
     }
 
-    private static void executeTalismanAttributes(Event e, Player p, Talisman talisman) {
-        consumeItem(p, talisman);
+    private static void activateTalisman(Event e, Player p, Inventory inv, Talisman talisman) {
+        consumeItem(inv, talisman);
         applyTalismanEffects(p, talisman);
         cancelEvent(e, talisman);
         sendMessage(p, talisman);
@@ -175,9 +176,10 @@ public class Talisman extends SlimefunItem {
         }
     }
 
-    private static void consumeItem(Player p, Talisman talisman){
-        if (talisman.isConsumable())
-            p.getInventory().removeItem(talisman.getItem());
+    private static void consumeItem(Inventory inv, Talisman talisman){
+        if (talisman.isConsumable()) {
+        	inv.removeItem(talisman.getItem());
+        }
     }
 
     private static Player getPlayerByEventType(Event e) {