From 8d97c89cbb1f678aa97448b45b0a02cf5d891f10 Mon Sep 17 00:00:00 2001 From: Navoei Date: Sat, 14 Oct 2023 16:17:52 -0500 Subject: [PATCH] Bug fix for Relic disc --- .../customdiscsplugin/HopperManager.java | 2 +- .../customdiscsplugin/event/JukeBox.java | 22 +------------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java b/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java index 1ba6e5b..8c45c71 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java +++ b/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java @@ -102,7 +102,7 @@ public class HopperManager implements Listener { } private boolean isCustomMusicDisc (ItemStack item) { - return item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc"), PersistentDataType.STRING) && item.getType().toString().contains("MUSIC_DISC"); + return item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc"), PersistentDataType.STRING); } private static HopperManager instance; diff --git a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java index 96fb40a..8742d62 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java +++ b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java @@ -104,7 +104,6 @@ public class JukeBox implements Listener{ public void onJukeboxBreak(BlockBreakEvent event) { Block block = event.getBlock(); - Player player = event.getPlayer(); if (block.getType() != Material.JUKEBOX) return; @@ -128,27 +127,8 @@ public class JukeBox implements Listener{ } public boolean isCustomMusicDisc(PlayerInteractEvent e) { - if (e.getItem()==null) return false; - - return e.getItem().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc")) && - ( - e.getItem().getType().equals(Material.MUSIC_DISC_13) || - e.getItem().getType().equals(Material.MUSIC_DISC_CAT) || - e.getItem().getType().equals(Material.MUSIC_DISC_BLOCKS) || - e.getItem().getType().equals(Material.MUSIC_DISC_CHIRP) || - e.getItem().getType().equals(Material.MUSIC_DISC_FAR) || - e.getItem().getType().equals(Material.MUSIC_DISC_MALL) || - e.getItem().getType().equals(Material.MUSIC_DISC_MELLOHI) || - e.getItem().getType().equals(Material.MUSIC_DISC_STAL) || - e.getItem().getType().equals(Material.MUSIC_DISC_STRAD) || - e.getItem().getType().equals(Material.MUSIC_DISC_WARD) || - e.getItem().getType().equals(Material.MUSIC_DISC_11) || - e.getItem().getType().equals(Material.MUSIC_DISC_WAIT) || - e.getItem().getType().equals(Material.MUSIC_DISC_OTHERSIDE) || - e.getItem().getType().equals(Material.MUSIC_DISC_5) || - e.getItem().getType().equals(Material.MUSIC_DISC_PIGSTEP) - ); + return e.getItem().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc")); } private void stopDisc(Block block) {