Skip to content

Commit 8527d4f

Browse files
committed
fix: entities_require_admin reason reached for hanging entities
1 parent 21e5b73 commit 8527d4f

1 file changed

Lines changed: 1 addition & 20 deletions

File tree

src/main/java/net/democracycraft/vault/internal/security/VaultCapturePolicy.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ public static Decision evaluate(Player actor, Block block) {
9494
VaultStoragePlugin.getInstance().getLogger().warning("[VaultCapturePolicy] Invalid actor UUID for player " + actor.getName() + ": " + actorUUID);
9595
}
9696

97-
// Check for Hanging (ItemFrames, Paintings) attached to or intersecting the block
98-
// Non-admins are not allowed to unlock/vault the block itself while hangings remain.
99-
boolean hangableRestricted = computeHangableRestricted(actor, block, originalOwner);
100-
101-
return evaluateBlockPolicy(actor, block, originalOwner, hangableRestricted);
97+
return evaluateBlockPolicy(actor, block, originalOwner, false);
10298
}
10399

104100
/**
@@ -131,21 +127,6 @@ public static Decision evaluateHangingCapture(Player actor, Hanging hanging, Blo
131127
return evaluateBlockPolicy(actor, supportingBlock, originalOwner, false);
132128
}
133129

134-
private static boolean computeHangableRestricted(Player actor, Block block, UUID originalOwner) {
135-
if (originalOwner == null || VaultPermission.ADMIN.has(actor)) {
136-
return false;
137-
}
138-
try {
139-
var nearby = block.getWorld().getNearbyEntities(block.getBoundingBox().expand(0.2));
140-
for (Entity entity : nearby) {
141-
if (entity instanceof Hanging) {
142-
return true;
143-
}
144-
}
145-
} catch (Throwable ignored) {}
146-
return false;
147-
}
148-
149130
private static Decision evaluateBlockPolicy(Player actor, Block block, UUID originalOwner, boolean hangableRestricted) {
150131
boolean hasOverride = VaultPermission.ACTION_PLACE_OVERRIDE.has(actor);
151132
boolean actorIsContainerOwner = originalOwner != null && originalOwner.equals(actor.getUniqueId());

0 commit comments

Comments
 (0)