From a9fcd6a9e5098d2a682a9a6c32ebdc8e4b842f84 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Thu, 9 Sep 2021 20:34:05 +0100 Subject: Update Slimefun (closes #258) --- bukkit/build.gradle | 2 +- .../leonardobishop/quests/bukkit/item/SlimefunQuestItem.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 0f0b4390..1d902773 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -104,7 +104,7 @@ dependencies { compileOnly 'net.Indyuce:MMOItems:6.5' compileOnly 'io.lumine:MythicLib:1.1.1' // Slimefun4 - compileOnly 'com.github.Slimefun:Slimefun4:RC-26' + compileOnly 'com.github.Slimefun:Slimefun4:RC-28' // bStats implementation 'org.bstats:bstats-bukkit-lite:1.8' // HikariCP diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/SlimefunQuestItem.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/SlimefunQuestItem.java index ce3a61d5..c8dbeea9 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/SlimefunQuestItem.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/item/SlimefunQuestItem.java @@ -1,8 +1,6 @@ package com.leonardobishop.quests.bukkit.item; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import net.Indyuce.mmoitems.MMOItems; -import net.Indyuce.mmoitems.api.Type; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import org.bukkit.inventory.ItemStack; public class SlimefunQuestItem extends QuestItem { @@ -16,7 +14,11 @@ public class SlimefunQuestItem extends QuestItem { @Override public ItemStack getItemStack() { - return SlimefunItem.getByID(slimefunId).getItem(); + SlimefunItem item = SlimefunItem.getById(slimefunId); + if (item == null) { + return null; + } + return item.getItem(); } @Override -- cgit v1.2.3-70-g09d2