spawnrys/FUCK-CustomDiscs
1
0
Fork 0
mirror of https://github.com/SPAWNRYS-ban/FUCK-CustomDiscs.git synced 2025-12-10 05:19:43 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix ( Issue #4 )

Browse Source
This commit is contained in:
Navoei
2022-08-16 16:35:38 -05:00
parent ec4076f2ba
commit 03d7a82e30
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -11,6 +11,6 @@ mod_id=customdiscsplugin
# Target an older API to make it compatible with older versions of Simple Voice Chat # Target an older API to make it compatible with older versions of Simple Voice Chat
voicechat_api_version=2.3.3 voicechat_api_version=2.3.3
plugin_version=2.1 plugin_version=2.1.1
maven_group=me.Navoei.customdiscsplugin maven_group=me.Navoei.customdiscsplugin
archives_base_name=custom-discs archives_base_name=custom-discs

6
src/main/java/me/Navoei/customdiscsplugin/HopperManager.java
View File

@@ -28,7 +28,8 @@ public class HopperManager implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onHopperPickupFromOtherSource(InventoryMoveItemEvent event) { public void onHopperPickupFromOtherSource(InventoryMoveItemEvent event) {
if (!Objects.requireNonNull(event.getDestination().getLocation()).getChunk().isLoaded()) return; if (event.getDestination().getLocation() == null) return;
if (!event.getDestination().getLocation().getChunk().isLoaded()) return;
if (!event.getDestination().getLocation().getBlock().getType().equals(Material.HOPPER)) return; if (!event.getDestination().getLocation().getBlock().getType().equals(Material.HOPPER)) return;
if (!isCustomMusicDisc(event.getItem())) return; if (!isCustomMusicDisc(event.getItem())) return;
@@ -225,7 +226,8 @@ public class HopperManager implements Listener {
public void itemJukeboxToHopper (Block block) { public void itemJukeboxToHopper (Block block) {
if (!Objects.requireNonNull(block.getLocation()).getChunk().isLoaded()) return; if (block == null) return;
if (!block.getLocation().getChunk().isLoaded()) return;
if (!block.getType().equals(Material.JUKEBOX)) return; if (!block.getType().equals(Material.JUKEBOX)) return;
if (!block.getRelative(BlockFace.DOWN).getType().equals(Material.HOPPER)) return; if (!block.getRelative(BlockFace.DOWN).getType().equals(Material.HOPPER)) return;

3
src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java
View File

@@ -79,10 +79,9 @@ public class JukeBox implements Listener{
if (jukeboxContainsDisc(block)) { if (jukeboxContainsDisc(block)) {
stopDisc(block, player); stopDisc(block, player);
Bukkit.getScheduler().runTaskLater(CustomDiscs.getInstance(), () -> HopperManager.instance().getNextDiscFromHopperIntoJukebox(block), 1L); Bukkit.getScheduler().runTaskLater(CustomDiscs.getInstance(), () -> HopperManager.instance().getNextDiscFromHopperIntoJukebox(block), 1L);
} }
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)