Skip to content

Commit c25059c

Browse files
committed
Merge branch 'dev'
2 parents 3419f04 + 227f3d3 commit c25059c

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/VanillaInventoryDropHandler.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
44
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler;
5-
import io.papermc.lib.PaperLib;
65
import java.util.List;
76
import javax.annotation.Nonnull;
87
import javax.annotation.ParametersAreNonnullByDefault;
@@ -54,13 +53,8 @@ public VanillaInventoryDropHandler(@Nonnull Class<T> blockStateClass) {
5453
@Override
5554
@ParametersAreNonnullByDefault
5655
public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List<ItemStack> drops) {
57-
// Fixes #2906 - Spigot being buggy as always...
58-
if (!PaperLib.isPaper()) {
59-
return;
60-
}
61-
6256
Block b = e.getBlock();
63-
BlockState state = PaperLib.getBlockState(b, false).getState();
57+
BlockState state = b.getState(false);
6458

6559
if (blockStateClass.isInstance(state)) {
6660
T inventoryHolder = blockStateClass.cast(state);

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/OutputChest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,9 @@ public static Optional<Inventory> findOutputChestFor(@Nonnull Block b, @Nonnull
7373

7474
return Optional.empty();
7575
}
76+
77+
@Override
78+
public boolean loadDataByDefault() {
79+
return true;
80+
}
7681
}

0 commit comments

Comments
 (0)