Skip to content

Use elevator-specific permission in Protect flags #31

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

Open
NonSwag wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use elevator-specific permission in Protect flags #31

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
5 changes: 3 additions & 2 deletions hooks/src/main/java/me/keehl/elevators/services/hooks/ProtectHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public void failed(Player player, String message) {
@Override
public boolean canPlayerUseElevator(Player player, Elevator elevator, boolean sendMessage) {
Area area = this.areaProvider.getArea(elevator.getLocation());
if (this.protectionService.canPerformAction(player, area, this.useFlag, null)) return true;
var usePermission = elevator.getElevatorType().getUsePermission();
if (this.protectionService.canPerformAction(player, area, this.useFlag, usePermission)) return true;
if (sendMessage) this.failed(player, "You are not allowed to do that here!");
return false;
}
Expand All @@ -79,7 +80,7 @@ public boolean canEditName(Player player, Elevator elevator, boolean sendMessage
@Override
public boolean canEditSettings(Player player, Elevator elevator, boolean sendMessage) {
Area area = this.areaProvider.getArea(elevator.getLocation());
if (this.protectionService.canPerformAction(player, area, this.settingsFlag, null)) return true;
if (this.protectionService.canPerformAction(player, area, this.settingsFlag, "elevators.admin")) return true;
if (sendMessage) this.failed(player, "You are not allowed to do that here!");
return false;
}
Expand Down