Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't allow droppers to move items if redstone is disallowed #127

Merged
merged 1 commit into from
Feb 10, 2024
Merged

Don't allow droppers to move items if redstone is disallowed #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bukkit/src/main/java/org/popcraft/bolt/listeners/InventoryListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

public final class InventoryListener implements Listener {
private static final SourceResolver BLOCK_SOURCE_RESOLVER = new SourceTypeResolver(Source.of(SourceTypes.BLOCK));
private static final SourceResolver REDSTONE_SOURCE_RESOLVER = new SourceTypeResolver(Source.of(SourceTypes.REDSTONE));
private static final InventoryType CRAFTER_TYPE = EnumUtil.valueOf(InventoryType.class, "CRAFTER").orElse(null);
private static final Material CRAFTER_MATERIAL = EnumUtil.valueOf(Material.class, "CRAFTER").orElse(null);
private static final Map<InventoryType, EnumSet<Material>> INVENTORY_TYPE_BLOCKS = new HashMap<>(Map.of(
Expand Down Expand Up @@ -153,6 +154,13 @@ public void onInventoryMoveItem(final InventoryMoveItemEvent e) {
if (sourceProtection == null && destinationProtection == null) {
return;
}
// Droppers can move items to another container, but they need to be activated by redstone to do so
if (sourceProtection != null && InventoryType.DROPPER.equals(e.getSource().getType())) {
if (!plugin.canAccess(sourceProtection, REDSTONE_SOURCE_RESOLVER, Permission.REDSTONE)) {
e.setCancelled(true);
return;
}
}
if (sourceProtection != null && destinationProtection != null) {
if (!plugin.canAccess(destinationProtection, sourceProtection.getOwner(), Permission.DEPOSIT) || !plugin.canAccess(sourceProtection, destinationProtection.getOwner(), Permission.WITHDRAW)) {
e.setCancelled(true);
Expand Down