Merge from upstream

mcchampions · Aug 10, 2024 · e177bd1 · e177bd1
2 parents cca8d92 + 7a3786e
commit e177bd1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
@@ -102,12 +102,6 @@ public List<SlimefunItem> getAllSlimefunItems() {
         return slimefunItems;
     }
 
-    /**
-     * This {@link List} contains every <strong>enabled</strong> {@link SlimefunItem}.
-     *
-     * @return A {@link List} containing every enabled {@link SlimefunItem}
-     */
-
     public List<SlimefunItem> getEnabledSlimefunItems() {
         return enabledItems;
     }

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
@@ -165,7 +165,7 @@ public void onBlockBreak(BlockBreakEvent e) {
         var heldItem = e.getPlayer().getInventory().getItemInMainHand();
         var block = e.getBlock();
         var blockData = StorageCacheUtils.getBlock(block.getLocation());
-        var sfItem = SlimefunItem.getById(blockData.getSfId());
+        var sfItem = blockData == null ? null : SlimefunItem.getById(blockData.getSfId());
 
         // If there is a Slimefun Block here, call our BreakEvent and, if cancelled, cancel this event
         // and return