EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-05 03:13:14 +01:00
Code Issues Projects Releases Wiki Activity

feat: add specific admin permissions for placing vehicles

Browse Source 
- fixes #3850
This commit is contained in:
dordsor21 2023-12-03 16:05:47 +00:00
parent 1a18adcd95
commit 3dc4410a1e
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/main/java/com/plotsquared/core/permissions/Permission.java
View File

@ -59,6 +59,9 @@ public enum Permission implements ComponentLike {
PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
PERMISSION_ADMIN_PVE("plots.admin.pve"),
PERMISSION_ADMIN_PLACE_VEHICLE_ROAD("plots.admin.vehicle.place.road"),
PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED("plots.admin.vehicle.place.unowned"),
PERMISSION_ADMIN_PLACE_VEHICLE_OTHER("plots.admin.vehicle.place.other"),
PERMISSION_ADMIN_PVP("plots.admin.pvp"),
PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),

73
Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
View File

@ -375,14 +375,10 @@ public class EventDispatcher {
return true;
}
}
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
}
if (!plot.hasOwner()) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
}
final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
for (final BlockTypeWrapper blockTypeWrapper : use) {
@ -391,7 +387,7 @@ public class EventDispatcher {
return true;
}
}
if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) {
if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
return true;
}
// we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
@ -416,14 +412,10 @@ public class EventDispatcher {
return true;
}
}
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, false);
}
if (!plot.hasOwner()) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, false);
}
if (plot.getFlag(DeviceInteractFlag.class)) {
return true;
@ -435,21 +427,14 @@ public class EventDispatcher {
return true;
}
}
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
false
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER,false);
}
case SPAWN_MOB -> {
if (plot == null) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
}
if (!plot.hasOwner()) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
}
if (plot.getFlag(MobPlaceFlag.class)) {
return true;
@ -461,10 +446,7 @@ public class EventDispatcher {
return true;
}
}
if (player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
false
)) {
if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER,false)) {
return true;
}
if (notifyPerms) {
@ -484,14 +466,10 @@ public class EventDispatcher {
}
case PLACE_MISC -> {
if (plot == null) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
}
if (!plot.hasOwner()) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
}
if (plot.getFlag(MiscPlaceFlag.class)) {
return true;
@ -503,10 +481,7 @@ public class EventDispatcher {
return true;
}
}
if (player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
false
)) {
if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER,false)) {
return true;
}
if (notifyPerms) {
@ -526,16 +501,28 @@ public class EventDispatcher {
}
case PLACE_VEHICLE -> {
if (plot == null) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
);
return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_ROAD, notifyPerms);
}
if (!plot.hasOwner()) {
return player.hasPermission(
Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED, notifyPerms);
}
if (plot.getFlag(VehiclePlaceFlag.class)) {
return true;
}
if (player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_OTHER, false)) {
return true;
}
if (notifyPerms) {
player.sendMessage(
TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
TagResolver.resolver(
"flag",
Tag.inserting(
PlotFlag.getFlagNameComponent(VehiclePlaceFlag.class)
)
)
);
}
return plot.getFlag(VehiclePlaceFlag.class);
}
default -> {
}