diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java index dded70e62..343acce06 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java @@ -55,7 +55,6 @@ import com.plotsquared.core.plot.flag.implementations.VineGrowFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; import com.plotsquared.core.plot.flag.types.BooleanFlag; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotFlagUtil; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.task.TaskTime; @@ -278,7 +277,7 @@ public class BlockEventListener implements Listener { return; } if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) @@ -295,7 +294,7 @@ public class BlockEventListener implements Listener { return; } } - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) @@ -306,7 +305,7 @@ public class BlockEventListener implements Listener { return; } } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage( TranslatableCaption.of("done.building_restricted") ); @@ -322,7 +321,7 @@ public class BlockEventListener implements Listener { + " did not fall because of disable-physics = true"); } } - } else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { + } else if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) @@ -344,8 +343,7 @@ public class BlockEventListener implements Listener { BukkitPlayer plotPlayer = BukkitUtil.adapt(player); // == rather than <= as we only care about the "ground level" not being destroyed if (event.getBlock().getY() == area.getMinGenHeight()) { - if (!Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) @@ -358,8 +356,7 @@ public class BlockEventListener implements Listener { return; } if (!plot.hasOwner()) { - if (!Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED, true)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED, true)) { event.setCancelled(true); } return; @@ -373,8 +370,7 @@ public class BlockEventListener implements Listener { return; } } - if (Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { return; } plotPlayer.sendMessage( @@ -383,7 +379,7 @@ public class BlockEventListener implements Listener { ); event.setCancelled(true); } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { plotPlayer.sendMessage( TranslatableCaption.of("done.building_restricted") ); @@ -394,7 +390,7 @@ public class BlockEventListener implements Listener { return; } BukkitPlayer pp = BukkitUtil.adapt(player); - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { return; } if (this.worldEdit != null && pp.getAttribute("worldedit")) { @@ -479,18 +475,18 @@ public class BlockEventListener implements Listener { BukkitPlayer plotPlayer = BukkitUtil.adapt(player); if (plot != null) { if (!plot.hasOwner()) { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { return; } } else if (!plot.isAdded(plotPlayer.getUUID())) { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { return; } } else { return; } } else { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { return; } if (this.worldEdit != null && plotPlayer.getAttribute("worldedit")) { @@ -635,8 +631,7 @@ public class BlockEventListener implements Listener { } if (!plot.hasOwner()) { BukkitPlayer plotPlayer = BukkitUtil.adapt(player); - if (Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { return; } event.setCancelled(true); @@ -648,8 +643,7 @@ public class BlockEventListener implements Listener { Block block = event.getBlock(); if (destroy .contains(BlockTypeWrapper.get(BukkitAdapter.asBlockType(block.getType()))) - || Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { + || plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { return; } plot.debug(player.getName() + " could not break " + block.getType() @@ -660,7 +654,7 @@ public class BlockEventListener implements Listener { return; } BukkitPlayer plotPlayer = BukkitUtil.adapt(player); - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { return; } event.setCancelled(true); @@ -1088,8 +1082,7 @@ public class BlockEventListener implements Listener { return; } if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_BUILD_ROAD )) { pp.sendMessage( @@ -1099,8 +1092,7 @@ public class BlockEventListener implements Listener { event.setCancelled(true); } } else if (!plot.hasOwner()) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_BUILD_UNOWNED )) { pp.sendMessage( @@ -1110,7 +1102,7 @@ public class BlockEventListener implements Listener { event.setCancelled(true); } } else if (!plot.isAdded(pp.getUUID())) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) @@ -1234,8 +1226,7 @@ public class BlockEventListener implements Listener { for (final BlockState state : event.getReplacedBlockStates()) { Location currentLocation = BukkitUtil.adapt(state.getLocation()); - if (!Permissions.hasPermission( - pp, + if (!pp.hasPermission( Permission.PERMISSION_ADMIN_BUILD_ROAD ) && !(Objects.equals(currentLocation.getPlot(), plot))) { pp.sendMessage( diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java index 3e32a9816..68f658a20 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java @@ -37,7 +37,6 @@ import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; import com.plotsquared.core.plot.flag.implementations.InvincibleFlag; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotFlagUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.block.BlockType; @@ -371,14 +370,13 @@ public class EntityEventListener implements Listener { if (shooter instanceof Player) { PlotPlayer pp = BukkitUtil.adapt((Player) shooter); if (plot == null) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { entity.remove(); event.setCancelled(true); } return; } - if (plot.isAdded(pp.getUUID()) || Permissions - .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { + if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { return; } entity.remove(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java index 8c4b5b9b6..d14a259b3 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java @@ -25,7 +25,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; -import com.plotsquared.core.util.Permissions; import org.bukkit.entity.Player; import org.bukkit.util.Vector; @@ -109,8 +108,7 @@ public class ForceFieldListener { if (plot.isAdded(uuid)) { Set> players = getNearbyPlayers(player, plot); for (PlotPlayer oPlayer : players) { - if (!Permissions - .hasPermission(oPlayer, Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { + if (!oPlayer.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { ((BukkitPlayer) oPlayer).player .setVelocity(calculateVelocity(plotPlayer, oPlayer)); } @@ -120,8 +118,7 @@ public class ForceFieldListener { if (oPlayer == null) { return; } - if (!Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) { player.setVelocity(calculateVelocity(oPlayer, plotPlayer)); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java index 3ad3a6227..dee073885 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java @@ -43,7 +43,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; import com.plotsquared.core.plot.flag.types.BooleanFlag; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotFlagUtil; import net.kyori.adventure.text.minimessage.Template; import org.bukkit.Chunk; @@ -335,8 +334,7 @@ public class PaperListener implements Listener { Plot plot = location.getOwnedPlot(); if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_PROJECTILE_ROAD )) { pp.sendMessage( @@ -347,7 +345,7 @@ public class PaperListener implements Listener { event.setCancelled(true); } } else if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) @@ -357,7 +355,7 @@ public class PaperListener implements Listener { } } else if (!plot.isAdded(pp.getUUID())) { if (!plot.getFlag(ProjectilesFlag.class)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java index fbe26e676..6602cb8be 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java @@ -67,7 +67,6 @@ import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotFlagUtil; import com.plotsquared.core.util.PremiumVerification; import com.plotsquared.core.util.entity.EntityCategories; @@ -275,8 +274,10 @@ public class PlayerEventListener implements Listener { switch (parts[0]) { case "up": case "worldedit:up": - if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) { + if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission( + Permission.PERMISSION_ADMIN_BUILD_OTHER, + true + ))) { event.setCancelled(true); return; } @@ -291,7 +292,7 @@ public class PlayerEventListener implements Listener { if (blockedCommands.isEmpty()) { return; } - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) { return; } // When using namespaced commands, we're not interested in the namespace @@ -310,7 +311,7 @@ public class PlayerEventListener implements Listener { } else { perm = "plots.admin.command.blocked-cmds.road"; } - if (!Permissions.hasPermission(plotPlayer, perm)) { + if (!plotPlayer.hasPermission(perm)) { plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked")); event.setCancelled(true); } @@ -600,7 +601,7 @@ public class PlayerEventListener implements Listener { int border = area.getBorder(); int x1; if (x2 > border && this.tmpTeleport) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { to.setX(border - 1); this.tmpTeleport = false; player.teleport(event.getTo()); @@ -610,7 +611,7 @@ public class PlayerEventListener implements Listener { pp.sendMessage(TranslatableCaption.of("border.bypass.exited")); } } else if (x2 < -border && this.tmpTeleport) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { to.setX(-border + 1); this.tmpTeleport = false; player.teleport(event.getTo()); @@ -620,7 +621,7 @@ public class PlayerEventListener implements Listener { pp.sendMessage(TranslatableCaption.of("border.bypass.exited")); } } else if (((x1 = MathMan.roundInt(from.getX())) >= border && x2 <= border) || (x1 <= -border && x2 >= -border)) { - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { pp.sendMessage(TranslatableCaption.of("border.bypass.entered")); } } @@ -691,7 +692,7 @@ public class PlayerEventListener implements Listener { int border = area.getBorder(); int z1; if (z2 > border && this.tmpTeleport) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { to.setZ(border - 1); this.tmpTeleport = false; player.teleport(event.getTo()); @@ -701,7 +702,7 @@ public class PlayerEventListener implements Listener { pp.sendMessage(TranslatableCaption.of("border.bypass.exited")); } } else if (z2 < -border && this.tmpTeleport) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { to.setZ(-border + 1); this.tmpTeleport = false; player.teleport(event.getTo()); @@ -711,7 +712,7 @@ public class PlayerEventListener implements Listener { pp.sendMessage(TranslatableCaption.of("border.bypass.exited")); } } else if (((z1 = MathMan.roundInt(from.getZ())) >= border && z2 <= border) || (z1 <= -border && z2 >= -border)) { - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { pp.sendMessage(TranslatableCaption.of("border.bypass.entered")); } } @@ -738,8 +739,7 @@ public class PlayerEventListener implements Listener { || area.isForcingPlotChat())) { return; } - if (plot.isDenied(plotPlayer.getUUID()) && !Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_CHAT_BYPASS)) { + if (plot.isDenied(plotPlayer.getUUID()) && !plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_CHAT_BYPASS)) { return; } event.setCancelled(true); @@ -824,7 +824,7 @@ public class PlayerEventListener implements Listener { plotListener.plotExit(pp, plot); } if (this.worldEdit != null) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_WORLDEDIT_BYPASS)) { + if (!pp.hasPermission(Permission.PERMISSION_WORLDEDIT_BYPASS)) { if (pp.getAttribute("worldedit")) { pp.removeAttribute("worldedit"); } @@ -880,8 +880,7 @@ public class PlayerEventListener implements Listener { final Plot plot = pp.getCurrentPlot(); if (plot != null) { if (plot.getFlag(PreventCreativeCopyFlag.class) && !plot - .isAdded(player.getUniqueId()) && !Permissions - .hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { + .isAdded(player.getUniqueId()) && !pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { final ItemStack newStack = new ItemStack(newItem.getType(), newItem.getAmount()); event.setCursor(newStack); @@ -943,7 +942,7 @@ public class PlayerEventListener implements Listener { Plot plot = area.getPlotAbs(location); boolean cancelled = false; if (plot == null) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) @@ -951,7 +950,7 @@ public class PlayerEventListener implements Listener { cancelled = true; } } else if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) @@ -961,7 +960,7 @@ public class PlayerEventListener implements Listener { } else { UUID uuid = pp.getUUID(); if (!plot.isAdded(uuid)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) @@ -998,8 +997,7 @@ public class PlayerEventListener implements Listener { Plot plot = location.getPlotAbs(); BukkitPlayer pp = BukkitUtil.adapt(e.getPlayer()); if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD )) { pp.sendMessage( @@ -1010,14 +1008,14 @@ public class PlayerEventListener implements Listener { } } else { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage(TranslatableCaption.of("done.building_restricted")); e.setCancelled(true); return; } } if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) { + if (!pp.hasPermission("plots.admin.interact.unowned")) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) @@ -1032,7 +1030,7 @@ public class PlayerEventListener implements Listener { if (plot.getFlag(MiscInteractFlag.class)) { return; } - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) @@ -1257,7 +1255,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer()); Plot plot = area.getPlot(location); if (plot == null) { - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { return; } pp.sendMessage( @@ -1266,7 +1264,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (!plot.hasOwner()) { - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { return; } pp.sendMessage( @@ -1275,7 +1273,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (!plot.isAdded(pp.getUUID())) { - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { return; } pp.sendMessage( @@ -1284,7 +1282,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage( TranslatableCaption.of("done.building_restricted") ); @@ -1322,7 +1320,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer plotPlayer = BukkitUtil.adapt(player); Plot plot = area.getPlot(location); if (plot == null) { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { return; } plotPlayer.sendMessage( @@ -1331,7 +1329,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (!plot.hasOwner()) { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { return; } plotPlayer.sendMessage( @@ -1340,7 +1338,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (!plot.isAdded(plotPlayer.getUUID())) { - if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { return; } plotPlayer.sendMessage( @@ -1349,7 +1347,7 @@ public class PlayerEventListener implements Listener { ); event.setCancelled(true); } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { plotPlayer.sendMessage( TranslatableCaption.of("done.building_restricted") ); @@ -1374,7 +1372,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(p); Plot plot = area.getPlot(location); if (plot == null) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_ROAD)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD)) @@ -1383,7 +1381,7 @@ public class PlayerEventListener implements Listener { } } else { if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) @@ -1394,7 +1392,7 @@ public class PlayerEventListener implements Listener { } if (!plot.isAdded(pp.getUUID())) { if (!plot.getFlag(HangingPlaceFlag.class)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER)) @@ -1423,7 +1421,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(p); Plot plot = area.getPlot(location); if (plot == null) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD)) @@ -1431,7 +1429,7 @@ public class PlayerEventListener implements Listener { event.setCancelled(true); } } else if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) @@ -1442,7 +1440,7 @@ public class PlayerEventListener implements Listener { if (plot.getFlag(HangingBreakFlag.class)) { return; } - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) @@ -1463,8 +1461,7 @@ public class PlayerEventListener implements Listener { Plot plot = area.getPlot(BukkitUtil.adapt(event.getEntity().getLocation())); if (plot != null) { if (!plot.hasOwner()) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) @@ -1473,8 +1470,7 @@ public class PlayerEventListener implements Listener { } } else if (!plot.isAdded(player.getUUID())) { if (!plot.getFlag(HangingBreakFlag.class)) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER)) @@ -1506,7 +1502,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(p); Plot plot = area.getPlot(location); if (plot == null && !area.isRoadFlags()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD)) @@ -1514,7 +1510,7 @@ public class PlayerEventListener implements Listener { event.setCancelled(true); } } else if (plot != null && !plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) @@ -1572,7 +1568,7 @@ public class PlayerEventListener implements Listener { return; } - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER)) @@ -1594,8 +1590,7 @@ public class PlayerEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(p); Plot plot = area.getPlot(location); if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, VehicleBreakFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, VehicleBreakFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD )) { pp.sendMessage( @@ -1606,7 +1601,7 @@ public class PlayerEventListener implements Listener { } } else { if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) @@ -1620,7 +1615,7 @@ public class PlayerEventListener implements Listener { if (plot.getFlag(VehicleBreakFlag.class)) { return; } - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java index 2703c8cd9..32773d0ba 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java @@ -30,7 +30,6 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotHandler; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotFlagUtil; import net.kyori.adventure.text.minimessage.Template; import org.bukkit.entity.Entity; @@ -106,8 +105,7 @@ public class ProjectileEventListener implements Listener { Plot plot = location.getOwnedPlot(); if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_PROJECTILE_ROAD )) { pp.sendMessage( @@ -118,7 +116,7 @@ public class ProjectileEventListener implements Listener { event.setCancelled(true); } } else if (!plot.hasOwner()) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) @@ -128,7 +126,7 @@ public class ProjectileEventListener implements Listener { } } else if (!plot.isAdded(pp.getUUID())) { if (!plot.getFlag(ProjectilesFlag.class)) { - if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { + if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) @@ -170,8 +168,7 @@ public class ProjectileEventListener implements Listener { PlotPlayer pp = BukkitUtil.adapt((Player) shooter); if (plot == null) { - if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission( - pp, + if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission( Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED )) { entity.remove(); @@ -179,8 +176,8 @@ public class ProjectileEventListener implements Listener { } return; } - if (plot.isAdded(pp.getUUID()) || Permissions - .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(ProjectilesFlag.class)) { + if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag( + ProjectilesFlag.class)) { return; } entity.remove(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java index 8d04b444e..928cbca7d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java @@ -87,4 +87,9 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer { ); } + @Override + public boolean hasPermission(@NonNull final String permission, final boolean notify) { + return hasPermission(permission); + } + } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java index 2661186a4..9c5e29b14 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java @@ -40,7 +40,6 @@ import com.plotsquared.core.plot.flag.implementations.PvpFlag; import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag; import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag; import com.plotsquared.core.util.EntityUtil; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.entity.EntityCategories; import com.sk89q.worldedit.bukkit.BukkitAdapter; import net.kyori.adventure.text.minimessage.Template; @@ -168,8 +167,7 @@ public class BukkitEntityUtil { if (plot != null && (plot.getFlag(HangingBreakFlag.class) || plot .isAdded(plotPlayer.getUUID()))) { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { - if (!Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) { plotPlayer.sendMessage( TranslatableCaption.of("done.building_restricted") ); @@ -178,7 +176,7 @@ public class BukkitEntityUtil { } return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub) @@ -190,7 +188,7 @@ public class BukkitEntityUtil { .isAdded(plotPlayer.getUUID()))) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub) @@ -211,7 +209,7 @@ public class BukkitEntityUtil { .getFlag(PveFlag.class))) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) @@ -232,7 +230,7 @@ public class BukkitEntityUtil { .getFlag(PveFlag.class))) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) @@ -245,8 +243,7 @@ public class BukkitEntityUtil { } } else if (EntityCategories.PLAYER.contains(entityType)) { if (isPlot) { - if (!plot.getFlag(PvpFlag.class) && !Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) { + if (!plot.getFlag(PvpFlag.class) && !plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub) @@ -260,7 +257,7 @@ public class BukkitEntityUtil { } else if (roadFlags && area.getRoadFlag(PvpFlag.class)) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub) @@ -277,7 +274,7 @@ public class BukkitEntityUtil { .getFlag(PveFlag.class))) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) @@ -299,7 +296,7 @@ public class BukkitEntityUtil { } else if (roadFlags && area.getRoadFlag(PveFlag.class)) { return true; } - if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) { + if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) { plotPlayer.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub) diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java index a457b6c50..04d36f285 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Add.java +++ b/Core/src/main/java/com/plotsquared/core/command/Add.java @@ -26,7 +26,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.task.RunnableVal2; @@ -58,18 +57,20 @@ public class Add extends Command { @Override public CompletableFuture execute( - final PlotPlayer player, String[] args, + final PlotPlayer player, + String[] args, RunnableVal3 confirm, RunnableVal2 whenDone ) throws CommandException { final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot")); checkTrue(plot.hasOwner(), TranslatableCaption.of("info.plot_unowned")); checkTrue( - plot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST), + plot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST), TranslatableCaption.of("permission.no_plot_perms") ); - checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"), + checkTrue( + args.length == 1, + TranslatableCaption.of("commandconfig.command_syntax"), Template.of("value", "/plot add ") ); final CompletableFuture future = new CompletableFuture<>(); @@ -94,9 +95,8 @@ public class Add extends Command { int size = plot.getTrusted().size() + plot.getMembers().size(); while (iterator.hasNext()) { UUID uuid = iterator.next(); - if (uuid == DBFunc.EVERYONE && !( - Permissions.hasPermission(player, Permission.PERMISSION_TRUST_EVERYONE) || Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { + if (uuid == DBFunc.EVERYONE && !(player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission( + Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { player.sendMessage( TranslatableCaption.of("errors.invalid_player"), Template.of("value", PlayerManager.resolveName(uuid).getComponent(player)) @@ -124,7 +124,7 @@ public class Add extends Command { } checkTrue(!uuids.isEmpty(), null); int localAddSize = plot.getMembers().size(); - int maxAddSize = Permissions.hasPermissionRange(player, Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS); + int maxAddSize = player.hasPermissionRange(Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS); if (localAddSize >= maxAddSize) { player.sendMessage( TranslatableCaption.of("members.plot_max_members_added"), diff --git a/Core/src/main/java/com/plotsquared/core/command/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java index 9063ede69..11439a6e8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Alias.java +++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java @@ -26,7 +26,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.query.PlotQuery; import net.kyori.adventure.text.minimessage.Template; @@ -194,7 +193,7 @@ public class Alias extends SubCommand { } private boolean isPermitted(PlotPlayer player, Permission permission) { - return Permissions.hasPermission(player, permission); + return player.hasPermission(permission); } } diff --git a/Core/src/main/java/com/plotsquared/core/command/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java index 4931d2cac..093ca744d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Area.java +++ b/Core/src/main/java/com/plotsquared/core/command/Area.java @@ -48,7 +48,6 @@ import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.setup.PlotAreaBuilder; import com.plotsquared.core.util.FileUtils; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.RegionUtil; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.SetupUtils; @@ -138,7 +137,7 @@ public class Area extends SubCommand { player.sendMessage(RequiredType.CONSOLE.getErrorMessage()); return false; } - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE)) @@ -288,7 +287,7 @@ public class Area extends SubCommand { return true; } case "c", "setup", "create" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_CREATE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE)) @@ -575,7 +574,7 @@ public class Area extends SubCommand { return true; } case "i", "info" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_INFO)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO)) @@ -653,7 +652,7 @@ public class Area extends SubCommand { return true; } case "l", "list" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_LIST)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST)) @@ -736,7 +735,7 @@ public class Area extends SubCommand { return true; } case "regen", "clear", "reset", "regenerate" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_REGEN)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN)) @@ -769,7 +768,7 @@ public class Area extends SubCommand { return true; } case "goto", "v", "teleport", "visit", "tp" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) { + if (!player.hasPermission(Permission.PERMISSION_AREA_TP)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AREA_TP)) @@ -825,19 +824,19 @@ public class Area extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { + if (player.hasPermission(Permission.PERMISSION_AREA_CREATE)) { completions.add("create"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) { + if (player.hasPermission(Permission.PERMISSION_AREA_CREATE)) { completions.add("single"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) { + if (player.hasPermission(Permission.PERMISSION_AREA_LIST)) { completions.add("list"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) { + if (player.hasPermission(Permission.PERMISSION_AREA_INFO)) { completions.add("info"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) { + if (player.hasPermission(Permission.PERMISSION_AREA_TP)) { completions.add("tp"); } final List commands = completions.stream().filter(completion -> completion @@ -852,7 +851,7 @@ public class Area extends SubCommand { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_AREA) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java index 60ed4bfea..1f78c6af3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -38,7 +38,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.services.plots.AutoService; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.task.AutoClaimFinishTask; import com.plotsquared.core.util.task.RunnableVal; @@ -246,7 +245,7 @@ public class Auto extends SubCommand { sizeX = event.getSizeX(); sizeZ = event.getSizeZ(); schematic = event.getSchematic(); - if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) { + if (!force && mega && !player.hasPermission(Permission.PERMISSION_AUTO_MEGA)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA)) @@ -279,11 +278,9 @@ public class Auto extends SubCommand { ); return true; } - if (!force && !Permissions.hasPermission( - player, + if (!force && !player.hasPermission( Permission.PERMISSION_CLAIM_SCHEMATIC.format(schematic) - ) && !Permissions - .hasPermission(player, "plots.admin.command.schematic")) { + ) && !player.hasPermission("plots.admin.command.schematic")) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.claim.%s0") diff --git a/Core/src/main/java/com/plotsquared/core/command/Backup.java b/Core/src/main/java/com/plotsquared/core/command/Backup.java index adb832c61..a0030ab1a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Backup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Backup.java @@ -27,7 +27,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; import net.kyori.adventure.text.minimessage.Template; @@ -144,8 +143,7 @@ public final class Backup extends Command { TranslatableCaption.of("backups.backup_impossible"), Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player)) ); - } else if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { + } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) @@ -198,8 +196,7 @@ public final class Backup extends Command { ); } else if (plot.getVolume() > Integer.MAX_VALUE) { player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); - } else if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { + } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) @@ -269,8 +266,7 @@ public final class Backup extends Command { ); } else if (plot.getVolume() > Integer.MAX_VALUE) { player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); - } else if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { + } else if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER)) diff --git a/Core/src/main/java/com/plotsquared/core/command/Caps.java b/Core/src/main/java/com/plotsquared/core/command/Caps.java index da99bcfb2..4093ce77e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Caps.java +++ b/Core/src/main/java/com/plotsquared/core/command/Caps.java @@ -29,7 +29,6 @@ import com.plotsquared.core.plot.flag.implementations.HostileCapFlag; import com.plotsquared.core.plot.flag.implementations.MiscCapFlag; import com.plotsquared.core.plot.flag.implementations.MobCapFlag; import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag; -import com.plotsquared.core.util.Permissions; import net.kyori.adventure.text.minimessage.Template; import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL; @@ -51,8 +50,7 @@ public class Caps extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if (!plot.isAdded(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) { + if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_CAPS_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER)) diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java index 821ade23d..0f17c7fbb 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Claim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java @@ -35,7 +35,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.task.TaskManager; import net.kyori.adventure.text.minimessage.Template; @@ -127,9 +126,8 @@ public class Claim extends SubCommand { Template.of("reason", "non-existent") ); } - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC - .format(schematic)) && !Permissions.hasPermission( - player, + if (!player.hasPermission(Permission.PERMISSION_CLAIM_SCHEMATIC + .format(schematic)) && !player.hasPermission( "plots.admin.command.schematic" ) && !force) { player.sendMessage( @@ -176,7 +174,7 @@ public class Claim extends SubCommand { ); } } - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) { int border = area.getBorder(); if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) { player.sendMessage(TranslatableCaption.of("border.denied")); diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java index a8d50e223..83a612951 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Clear.java +++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java @@ -32,7 +32,6 @@ import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; import com.plotsquared.core.util.task.TaskManager; @@ -89,13 +88,14 @@ public class Clear extends Command { } boolean force = eventResult == Result.FORCE; checkTrue( - force || plot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, "plots.admin.command.clear"), + force || plot.isOwner(player.getUUID()) || player.hasPermission("plots.admin.command.clear"), TranslatableCaption.of("permission.no_plot_perms") ); checkTrue(plot.getRunning() == 0, TranslatableCaption.of("errors.wait_for_timer")); - checkTrue(force || !Settings.Done.RESTRICT_BUILDING || !DoneFlag.isDone(plot) || Permissions - .hasPermission(player, "plots.continue"), TranslatableCaption.of("done.done_already_done")); + checkTrue( + force || !Settings.Done.RESTRICT_BUILDING || !DoneFlag.isDone(plot) || player.hasPermission("plots.continue"), + TranslatableCaption.of("done.done_already_done") + ); confirm.run(this, () -> { if (Settings.Teleport.ON_CLEAR) { plot.getPlayersInPlot().forEach(playerInPlot -> plot.teleportPlayer(playerInPlot, TeleportCause.COMMAND_CLEAR, diff --git a/Core/src/main/java/com/plotsquared/core/command/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java index 74d38407d..2821803a4 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java +++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java @@ -32,7 +32,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotCluster; import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.query.PlotQuery; import net.kyori.adventure.text.minimessage.Template; @@ -73,7 +72,7 @@ public class Cluster extends SubCommand { switch (sub) { case "l": case "list": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST)) @@ -126,7 +125,7 @@ public class Cluster extends SubCommand { } case "c": case "create": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE)) @@ -197,8 +196,7 @@ public class Cluster extends SubCommand { } Set plots = area.getPlotSelectionOwned(pos1, pos2); if (!plots.isEmpty()) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE_OTHER)) { UUID uuid = player.getUUID(); for (Plot plot : plots) { if (!plot.isOwner(uuid)) { @@ -219,10 +217,10 @@ public class Cluster extends SubCommand { } else { current = player.getPlayerClusterCount(player.getLocation().getWorldName()); } - int allowed = Permissions - .hasPermissionRange(player, Permission.PERMISSION_CLUSTER_SIZE, - Settings.Limit.MAX_PLOTS - ); + int allowed = player.hasPermissionRange( + Permission.PERMISSION_CLUSTER_SIZE, + Settings.Limit.MAX_PLOTS + ); if (current + cluster.getArea() > allowed) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), @@ -252,7 +250,7 @@ public class Cluster extends SubCommand { case "disband": case "del": case "delete": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE)) @@ -289,8 +287,7 @@ public class Cluster extends SubCommand { } } if (!cluster.owner.equals(player.getUUID())) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER)) @@ -307,7 +304,7 @@ public class Cluster extends SubCommand { } case "res": case "resize": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE)) @@ -347,8 +344,7 @@ public class Cluster extends SubCommand { return false; } if (!cluster.hasHelperRights(player.getUUID())) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) @@ -373,8 +369,7 @@ public class Cluster extends SubCommand { removed.removeAll(newPlots); // Check expand / shrink if (!removed.isEmpty()) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) @@ -384,8 +379,7 @@ public class Cluster extends SubCommand { } newPlots.removeAll(existing); if (!newPlots.isEmpty()) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) @@ -401,7 +395,8 @@ public class Cluster extends SubCommand { current = player.getPlayerClusterCount(player.getLocation().getWorldName()); } current -= cluster.getArea() + (1 + pos2.getX() - pos1.getX()) * (1 + pos2.getY() - pos1.getY()); - int allowed = Permissions.hasPermissionRange(player, Permission.PERMISSION_CLUSTER, + int allowed = player.hasPermissionRange( + Permission.PERMISSION_CLUSTER, Settings.Limit.MAX_PLOTS ); if (current + cluster.getArea() > allowed) { @@ -419,7 +414,7 @@ public class Cluster extends SubCommand { case "add": case "inv": case "invite": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE)) @@ -444,8 +439,7 @@ public class Cluster extends SubCommand { return false; } if (!cluster.hasHelperRights(player.getUUID())) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString()) @@ -485,7 +479,7 @@ public class Cluster extends SubCommand { case "k": case "remove": case "kick": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString()) @@ -509,8 +503,7 @@ public class Cluster extends SubCommand { return false; } if (!cluster.hasHelperRights(player.getUUID())) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString()) @@ -561,7 +554,7 @@ public class Cluster extends SubCommand { } case "quit": case "leave": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString()) @@ -619,7 +612,7 @@ public class Cluster extends SubCommand { return true; } case "members": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_HELPERS.toString()) @@ -674,7 +667,7 @@ public class Cluster extends SubCommand { case "spawn": case "home": case "tp": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString()) @@ -703,7 +696,7 @@ public class Cluster extends SubCommand { } UUID uuid = player.getUUID(); if (!cluster.isAdded(uuid)) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString()) @@ -719,7 +712,7 @@ public class Cluster extends SubCommand { case "info": case "show": case "information": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString()) @@ -792,7 +785,7 @@ public class Cluster extends SubCommand { case "sh": case "setspawn": case "sethome": { - if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString()) @@ -816,8 +809,7 @@ public class Cluster extends SubCommand { return false; } if (!cluster.hasHelperRights(player.getUUID())) { - if (!Permissions - .hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) { + if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString()) @@ -869,37 +861,37 @@ public class Cluster extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) { completions.add("list"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) { completions.add("create"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) { completions.add("delete"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) { completions.add("resize"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) { completions.add("invite"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) { completions.add("kick"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) { completions.add("leave"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) { completions.add("members"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) { completions.add("info"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) { completions.add("tp"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) { completions.add("sethome"); } final List commands = completions.stream().filter(completion -> completion @@ -914,7 +906,7 @@ public class Cluster extends SubCommand { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_CLUSTER) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java index c3cd5ce36..7e7e090db 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Command.java +++ b/Core/src/main/java/com/plotsquared/core/command/Command.java @@ -25,7 +25,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.permissions.PermissionHolder; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringComparison; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.task.RunnableVal2; @@ -466,7 +465,7 @@ public abstract class Command { if (message) { player.sendMessage(this.required.getErrorMessage()); } - } else if (!Permissions.hasPermission(player, getPermission())) { + } else if (!player.hasPermission(getPermission())) { if (message) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), diff --git a/Core/src/main/java/com/plotsquared/core/command/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java index 9db740575..5d064c7a8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Continue.java +++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java @@ -29,7 +29,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import net.kyori.adventure.text.minimessage.Template; import org.checkerframework.checker.nullness.qual.NonNull; @@ -53,8 +52,7 @@ public class Continue extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player)) diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java index 82afe0457..41870eb37 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Copy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java @@ -23,7 +23,6 @@ import com.plotsquared.core.location.Location; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import net.kyori.adventure.text.minimessage.Template; @CommandDeclaration(command = "copy", @@ -42,8 +41,7 @@ public class Copy extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if (!plot1.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN.toString())) { + if (!plot1.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN.toString())) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java index ba323673f..36ec56e31 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Delete.java +++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java @@ -30,7 +30,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.task.TaskManager; import net.kyori.adventure.text.minimessage.Template; @@ -83,8 +82,7 @@ public class Delete extends SubCommand { return true; } boolean force = eventResult == Result.FORCE; - if (!force && !plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DELETE)) { + if (!force && !plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DELETE)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java index 70cdb6e2d..585f25314 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -30,7 +30,6 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.WorldUtil; @@ -79,13 +78,12 @@ public class Deny extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DENY)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return true; } - int maxDenySize = Permissions.hasPermissionRange(player, Permission.PERMISSION_DENY, Settings.Limit.MAX_PLOTS); + int maxDenySize = player.hasPermissionRange(Permission.PERMISSION_DENY, Settings.Limit.MAX_PLOTS); int size = plot.getDenied().size(); if (size >= maxDenySize) { player.sendMessage( @@ -106,8 +104,7 @@ public class Deny extends SubCommand { } else { for (UUID uuid : uuids) { if (uuid == DBFunc.EVERYONE && !( - Permissions.hasPermission(player, Permission.PERMISSION_DENY_EVERYONE) || Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) { + player.hasPermission(Permission.PERMISSION_DENY_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DENY))) { player.sendMessage( TranslatableCaption.of("errors.invalid_player"), Template.of("value", args[0]) diff --git a/Core/src/main/java/com/plotsquared/core/command/Dislike.java b/Core/src/main/java/com/plotsquared/core/command/Dislike.java index d11afa828..e2cd89e8f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Dislike.java +++ b/Core/src/main/java/com/plotsquared/core/command/Dislike.java @@ -21,7 +21,6 @@ package com.plotsquared.core.command; import com.google.inject.Inject; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import org.checkerframework.checker.nullness.qual.NonNull; @@ -54,7 +53,7 @@ public class Dislike extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { + if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { completions.add("purge"); } final List commands = completions.stream().filter(completion -> completion @@ -62,7 +61,7 @@ public class Dislike extends SubCommand { .startsWith(args[0].toLowerCase())) .map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_RATE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_RATE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java index c50bdfce9..68c90b948 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Done.java +++ b/Core/src/main/java/com/plotsquared/core/command/Done.java @@ -34,7 +34,6 @@ import com.plotsquared.core.plot.expiration.PlotAnalysis; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal; import net.kyori.adventure.text.minimessage.Template; import org.checkerframework.checker.nullness.qual.NonNull; @@ -75,8 +74,7 @@ public class Done extends SubCommand { return true; } boolean force = event.getEventResult() == Result.FORCE; - if (!force && !plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DONE)) { + if (!force && !plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java index 15cf82851..9f3d2112b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Download.java +++ b/Core/src/main/java/com/plotsquared/core/command/Download.java @@ -27,7 +27,6 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotUploader; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.StringMan; @@ -87,13 +86,11 @@ public class Download extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && !DoneFlag.isDone(plot)) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) { + if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && !DoneFlag.isDone(plot)) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) { player.sendMessage(TranslatableCaption.of("done.done_not_done")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN.toString())) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN.toString())) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } @@ -111,7 +108,7 @@ public class Download extends SubCommand { upload(player, plot); } else if (args.length == 1 && StringMan .isEqualIgnoreCaseToAny(args[0], "mcr", "world", "mca")) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) { + if (!player.hasPermission(Permission.PERMISSION_DOWNLOAD_WORLD)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString()) @@ -147,10 +144,10 @@ public class Download extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD)) { + if (player.hasPermission(Permission.PERMISSION_DOWNLOAD)) { completions.add("schem"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) { + if (player.hasPermission(Permission.PERMISSION_DOWNLOAD_WORLD)) { completions.add("world"); } final List commands = completions.stream().filter(completion -> completion @@ -165,7 +162,7 @@ public class Download extends SubCommand { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_DOWNLOAD) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java index 16d28c38a..fd14d650c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java @@ -40,7 +40,6 @@ import com.plotsquared.core.plot.flag.types.IntegerFlag; import com.plotsquared.core.plot.flag.types.ListFlag; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringComparison; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.helpmenu.HelpMenu; @@ -128,7 +127,7 @@ public final class FlagCommand extends Command { key.toLowerCase(), entry.toString().toLowerCase() ); - final boolean result = Permissions.hasPermission(player, permission); + final boolean result = player.hasPermission(permission); if (!result) { player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", permission)); return false; @@ -150,9 +149,9 @@ public final class FlagCommand extends Command { boolean result; String basePerm = Permission.PERMISSION_SET_FLAG_KEY.format(key.toLowerCase()); if (flag.isValuedPermission()) { - result = Permissions.hasKeyedPermission(player, basePerm, value); + result = player.hasKeyedPermission(basePerm, value); } else { - result = Permissions.hasPermission(player, basePerm); + result = player.hasPermission(basePerm); perm = basePerm; } if (!result) { @@ -177,8 +176,7 @@ public final class FlagCommand extends Command { player.sendMessage(TranslatableCaption.of("working.plot_not_claimed")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_SET_FLAG_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER)) @@ -473,7 +471,7 @@ public final class FlagCommand extends Command { } boolean force = event.getEventResult() == Result.FORCE; flag = event.getFlag(); - if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))) { + if (!force && !player.hasPermission(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))) { if (args.length != 2) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), diff --git a/Core/src/main/java/com/plotsquared/core/command/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java index 841098515..48b3fdba7 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Grant.java +++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java @@ -26,7 +26,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.MetaDataAccess; import com.plotsquared.core.player.PlayerMetaDataKeys; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.task.RunnableVal; @@ -69,7 +68,7 @@ public class Grant extends Command { final String arg0 = args[0].toLowerCase(); switch (arg0) { case "add", "check" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) { + if (!player.hasPermission(Permission.PERMISSION_GRANT.format(arg0))) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_GRANT.format(arg0)) @@ -150,10 +149,10 @@ public class Grant extends Command { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_ADD)) { + if (player.hasPermission(Permission.PERMISSION_GRANT_ADD)) { completions.add("add"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_CHECK)) { + if (player.hasPermission(Permission.PERMISSION_GRANT_CHECK)) { completions.add("check"); } final List commands = completions.stream().filter(completion -> completion @@ -168,7 +167,7 @@ public class Grant extends Command { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_GRANT_SINGLE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_GRANT_SINGLE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java index 2218ba44e..afc940012 100644 --- a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java @@ -29,7 +29,6 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.query.PlotQuery; import com.plotsquared.core.util.query.SortingStrategy; @@ -104,8 +103,7 @@ public class HomeCommand extends Command { // /plot home <[area;]x;y> // /plot home // /plot home - if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OWNED) && !Permissions - .hasPermission(player, Permission.PERMISSION_HOME)) { + if (!player.hasPermission(Permission.PERMISSION_VISIT_OWNED) && !player.hasPermission(Permission.PERMISSION_HOME)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString()) diff --git a/Core/src/main/java/com/plotsquared/core/command/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java index 8bdc4df41..928cd84a7 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java +++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java @@ -30,7 +30,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.comment.CommentInbox; import com.plotsquared.core.plot.comment.CommentManager; import com.plotsquared.core.plot.comment.PlotComment; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.task.RunnableVal; @@ -285,13 +284,13 @@ public class Inbox extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_OWNER)) { + if (player.hasPermission(Permission.PERMISSION_INBOX_READ_OWNER)) { completions.add("owner"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_PUBLIC)) { + if (player.hasPermission(Permission.PERMISSION_INBOX_READ_PUBLIC)) { completions.add("public"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX_READ_REPORT)) { + if (player.hasPermission(Permission.PERMISSION_INBOX_READ_REPORT)) { completions.add("report"); } final List commands = completions.stream().filter(completion -> completion @@ -299,7 +298,7 @@ public class Inbox extends SubCommand { .startsWith(args[0].toLowerCase())) .map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.CHAT) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_INBOX) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_INBOX) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java index 6f4c085ad..613fd5cdf 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Info.java +++ b/Core/src/main/java/com/plotsquared/core/command/Info.java @@ -27,7 +27,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.implementations.HideInfoFlag; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import net.kyori.adventure.text.minimessage.Template; @@ -144,7 +143,7 @@ public class Info extends SubCommand { @Override public Collection tab(PlotPlayer player, String[] args, boolean space) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO_FORCE)) { + if (player.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE)) { completions.add("-f"); } @@ -154,7 +153,7 @@ public class Info extends SubCommand { .map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO_FORCE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } diff --git a/Core/src/main/java/com/plotsquared/core/command/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java index 111a29026..c1357f09e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Kick.java +++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java @@ -27,7 +27,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.WorldUtil; @@ -70,8 +69,7 @@ public class Kick extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_KICK)) { + if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_KICK)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } @@ -89,8 +87,7 @@ public class Kick extends SubCommand { for (UUID uuid : uuids) { if (uuid == DBFunc.EVERYONE) { for (PlotPlayer pp : plot.getPlayersInPlot()) { - if (pp == player || Permissions - .hasPermission(pp, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) { + if (pp == player || pp.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) { continue; } players.add(pp); @@ -118,7 +115,7 @@ public class Kick extends SubCommand { ); return; } - if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) { + if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) { player.sendMessage( TranslatableCaption.of("cluster.cannot_kick_player"), Template.of("name", player2.getName()) diff --git a/Core/src/main/java/com/plotsquared/core/command/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java index 9f93efe57..78f2023ea 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Like.java +++ b/Core/src/main/java/com/plotsquared/core/command/Like.java @@ -30,7 +30,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.Rating; import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.query.PlotQuery; import com.plotsquared.core.util.task.TaskManager; @@ -121,8 +120,7 @@ public class Like extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if (!Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) { return false; } plot.clearRatings(); @@ -204,7 +202,7 @@ public class Like extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { + if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { completions.add("purge"); } final List commands = completions.stream().filter(completion -> completion @@ -212,7 +210,7 @@ public class Like extends SubCommand { .startsWith(args[0].toLowerCase())) .map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_RATE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_RATE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java index fcb161926..63cf73b05 100644 --- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java @@ -36,7 +36,6 @@ import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.StringComparison; import com.plotsquared.core.util.StringMan; @@ -82,40 +81,40 @@ public class ListCmd extends SubCommand { private String[] getArgumentList(PlotPlayer player) { List args = new ArrayList<>(); - if (this.econHandler != null && Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) { + if (this.econHandler != null && player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) { args.add("forsale"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) { + if (player.hasPermission(Permission.PERMISSION_LIST_MINE)) { args.add("mine"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_SHARED)) { args.add("shared"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) { + if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) { args.add("world"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) { + if (player.hasPermission(Permission.PERMISSION_LIST_TOP)) { args.add("top"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) { + if (player.hasPermission(Permission.PERMISSION_LIST_ALL)) { args.add("all"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) { args.add("unowned"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) { + if (player.hasPermission(Permission.PERMISSION_LIST_PLAYER)) { args.add(""); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) { + if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) { args.add(""); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) { + if (player.hasPermission(Permission.PERMISSION_LIST_DONE)) { args.add("done"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) { args.add("expired"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) { + if (player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) { args.add("fuzzy "); } return args.toArray(new String[args.size()]); @@ -187,7 +186,7 @@ public class ListCmd extends SubCommand { switch (arg) { case "mine" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_MINE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.mine") @@ -202,7 +201,7 @@ public class ListCmd extends SubCommand { .withSortingStrategy(SortingStrategy.SORT_BY_TEMP)); } case "shared" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_SHARED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.shared") @@ -215,14 +214,14 @@ public class ListCmd extends SubCommand { .thatPasses(plot -> !plot.isOwnerAbs(player.getUUID()))); } case "world" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.world") ); return false; } - if (!Permissions.hasPermission(player, "plots.list.world." + world)) { + if (!player.hasPermission("plots.list.world." + world)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.world." + world) @@ -232,7 +231,7 @@ public class ListCmd extends SubCommand { plotConsumer.accept(PlotQuery.newQuery().inWorld(world)); } case "expired" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.expired") @@ -246,14 +245,14 @@ public class ListCmd extends SubCommand { } } case "area" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_AREA)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_AREA)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.area") ); return false; } - if (!Permissions.hasPermission(player, "plots.list.world." + world)) { + if (!player.hasPermission("plots.list.world." + world)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.world." + world) @@ -267,7 +266,7 @@ public class ListCmd extends SubCommand { } } case "all" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_ALL)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.all") @@ -277,7 +276,7 @@ public class ListCmd extends SubCommand { plotConsumer.accept(PlotQuery.newQuery().allPlots()); } case "done" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_DONE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.done") @@ -292,7 +291,7 @@ public class ListCmd extends SubCommand { .withSortingStrategy(SortingStrategy.SORT_BY_DONE)); } case "top" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_TOP)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.top") @@ -303,7 +302,7 @@ public class ListCmd extends SubCommand { plotConsumer.accept(PlotQuery.newQuery().allPlots().withSortingStrategy(SortingStrategy.SORT_BY_RATING)); } case "forsale" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.forsale") @@ -316,7 +315,7 @@ public class ListCmd extends SubCommand { plotConsumer.accept(PlotQuery.newQuery().allPlots().thatPasses(plot -> plot.getFlag(PriceFlag.class) > 0)); } case "unowned" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.unowned") @@ -326,7 +325,7 @@ public class ListCmd extends SubCommand { plotConsumer.accept(PlotQuery.newQuery().allPlots().thatPasses(plot -> plot.getOwner() == null)); } case "fuzzy" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.fuzzy") @@ -351,14 +350,14 @@ public class ListCmd extends SubCommand { } default -> { if (this.plotAreaManager.hasPlotArea(args[0])) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_WORLD)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.world") ); return false; } - if (!Permissions.hasPermission(player, "plots.list.world." + args[0])) { + if (!player.hasPermission("plots.list.world." + args[0])) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.world." + args[0]) @@ -382,7 +381,7 @@ public class ListCmd extends SubCommand { if (uuid == null) { player.sendMessage(TranslatableCaption.of("errors.invalid_player"), Templates.of("value", args[0])); } else { - if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) { + if (!player.hasPermission(Permission.PERMISSION_LIST_PLAYER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.list.player") @@ -515,31 +514,31 @@ public class ListCmd extends SubCommand { @Override public Collection tab(PlotPlayer player, String[] args, boolean space) { final List completions = new LinkedList<>(); - if (this.econHandler.isSupported() && Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) { + if (this.econHandler.isSupported() && player.hasPermission(Permission.PERMISSION_LIST_FOR_SALE)) { completions.add("forsale"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) { + if (player.hasPermission(Permission.PERMISSION_LIST_MINE)) { completions.add("mine"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_SHARED)) { completions.add("shared"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) { + if (player.hasPermission(Permission.PERMISSION_LIST_WORLD)) { completions.addAll(PlotSquared.platform().worldManager().getWorlds()); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) { + if (player.hasPermission(Permission.PERMISSION_LIST_TOP)) { completions.add("top"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) { + if (player.hasPermission(Permission.PERMISSION_LIST_ALL)) { completions.add("all"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_UNOWNED)) { completions.add("unowned"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) { + if (player.hasPermission(Permission.PERMISSION_LIST_DONE)) { completions.add("done"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) { + if (player.hasPermission(Permission.PERMISSION_LIST_EXPIRED)) { completions.add("expired"); } @@ -549,7 +548,7 @@ public class ListCmd extends SubCommand { .map(completion -> new Command(null, true, completion, "", RequiredType.NONE, CommandCategory.TELEPORT) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_LIST_PLAYER) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } diff --git a/Core/src/main/java/com/plotsquared/core/command/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java index f1b10ca73..933cc32c6 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Load.java +++ b/Core/src/main/java/com/plotsquared/core/command/Load.java @@ -31,7 +31,6 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; import com.plotsquared.core.plot.schematic.Schematic; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.TimeUtil; import com.plotsquared.core.util.task.RunnableVal; @@ -80,8 +79,7 @@ public class Load extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_LOAD)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_LOAD)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java index 77ebe94c3..eb1583a51 100644 --- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java @@ -32,7 +32,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.world.SinglePlotArea; import com.plotsquared.core.util.EconHandler; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; @@ -244,8 +243,8 @@ public class MainCommand extends Command { PlotArea area = player.getApplicablePlotArea(); Plot newPlot = Plot.fromString(area, args[0]); if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea() - .equals(area) || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN) - || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_AREA_SUDO)) + .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN) + || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO)) && !newPlot.isDenied(player.getUUID())) { final Location newLoc; if (newPlot.getArea() instanceof SinglePlotArea) { diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java index 6da21063b..335d3728d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -32,7 +32,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.StringMan; import net.kyori.adventure.text.minimessage.Template; @@ -124,7 +123,7 @@ public class Merge extends SubCommand { return false; } final int size = plot.getConnectedPlots().size(); - int max = Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS); + int max = player.hasPermissionRange("plots.merge", Settings.Limit.MAX_PLOTS); PlotMergeEvent event = this.eventDispatcher.callMerge(plot, direction, max, player); if (event.getEventResult() == Result.DENY) { @@ -152,7 +151,7 @@ public class Merge extends SubCommand { UUID uuid = player.getUUID(); if (!force && !plot.isOwner(uuid)) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_MERGE)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } else { @@ -164,8 +163,7 @@ public class Merge extends SubCommand { if (args.length == 2) { terrain = "true".equalsIgnoreCase(args[1]); } - if (!force && !terrain && !Permissions - .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) { + if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD)) @@ -202,8 +200,7 @@ public class Merge extends SubCommand { } else { terrain = true; } - if (!force && !terrain && !Permissions - .hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) { + if (!force && !terrain && !player.hasPermission(Permission.PERMISSION_MERGE_KEEP_ROAD)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD)) @@ -228,7 +225,7 @@ public class Merge extends SubCommand { player.sendMessage(TranslatableCaption.of("merge.no_available_automerge")); return false; } - if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) { + if (!force && !player.hasPermission(Permission.PERMISSION_MERGE_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER)) @@ -283,8 +280,14 @@ public class Merge extends SubCommand { } } if (force || !isOnline) { - if (force || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE_OTHER_OFFLINE)) { - if (plot.getPlotModificationManager().autoMerge(direction, maxSize - size, uuids.iterator().next(), player, terrain)) { + if (force || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_MERGE_OTHER_OFFLINE)) { + if (plot.getPlotModificationManager().autoMerge( + direction, + maxSize - size, + uuids.iterator().next(), + player, + terrain + )) { if (this.econHandler.isEnabled(plotArea) && price > 0d) { if (!force && this.econHandler.getMoney(player) < price) { player.sendMessage( diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java index 602e29c19..998420caa 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Move.java +++ b/Core/src/main/java/com/plotsquared/core/command/Move.java @@ -26,7 +26,6 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; import net.kyori.adventure.text.minimessage.Template; @@ -60,8 +59,7 @@ public class Move extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return CompletableFuture.completedFuture(false); } - if (!plot1.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN)) { + if (!plot1.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return CompletableFuture.completedFuture(false); } @@ -88,8 +86,7 @@ public class Move extends SubCommand { player.sendMessage(TranslatableCaption.of("invalid.origin_cant_be_target")); return CompletableFuture.completedFuture(false); } - if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN))) { + if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !player.hasPermission(Permission.PERMISSION_ADMIN))) { player.sendMessage(TranslatableCaption.of("errors.plotworld_incompatible")); return CompletableFuture.completedFuture(false); } diff --git a/Core/src/main/java/com/plotsquared/core/command/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java index f8a3af88d..1c760899a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Music.java +++ b/Core/src/main/java/com/plotsquared/core/command/Music.java @@ -33,7 +33,6 @@ import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.MusicFlag; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.InventoryUtil; -import com.plotsquared.core.util.Permissions; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; import net.kyori.adventure.text.minimessage.Template; @@ -79,8 +78,7 @@ public class Music extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if (!plot.isAdded(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) { + if (!plot.isAdded(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_MUSIC_OTHER)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER)) diff --git a/Core/src/main/java/com/plotsquared/core/command/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java index bb44a4686..15e06497e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Owner.java +++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java @@ -31,7 +31,6 @@ import com.plotsquared.core.player.PlayerMetaDataKeys; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.task.TaskManager; @@ -99,10 +98,10 @@ public class Owner extends SetCommand { uuid = event.getNewOwner(); boolean force = event.getEventResult() == Result.FORCE; if (uuid == null) { - if (!force && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER, - true - )) { + if (!force && !player.hasPermission( + Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER, + true + )) { return; } PlotUnlinkEvent unlinkEvent = this.eventDispatcher.callUnlink( @@ -139,8 +138,7 @@ public class Owner extends SetCommand { ); return; } - if (!force && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER)) { + if (!force && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_SET_OWNER)) { if (other == null) { player.sendMessage( TranslatableCaption.of("errors.invalid_player_offline"), diff --git a/Core/src/main/java/com/plotsquared/core/command/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java index 0c7a446d5..17869c44d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Rate.java +++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java @@ -34,7 +34,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.InventoryUtil; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.query.PlotQuery; import com.plotsquared.core.util.task.TaskManager; @@ -114,8 +113,7 @@ public class Rate extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return false; } - if (!Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS, true)) { return false; } plot.clearRatings(); @@ -273,10 +271,10 @@ public class Rate extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_RATE)) { + if (player.hasPermission(Permission.PERMISSION_RATE)) { completions.add("1 - 10"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { + if (player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_PURGE_RATINGS)) { completions.add("purge"); } final List commands = completions.stream().filter(completion -> completion @@ -284,7 +282,7 @@ public class Rate extends SubCommand { .startsWith(args[0].toLowerCase())) .map(completion -> new Command(null, true, completion, "", RequiredType.PLAYER, CommandCategory.INFO) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_RATE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_RATE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Remove.java b/Core/src/main/java/com/plotsquared/core/command/Remove.java index 3a2e06a2d..ecfab4a88 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Remove.java +++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java @@ -26,7 +26,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import net.kyori.adventure.text.minimessage.Template; @@ -65,8 +64,7 @@ public class Remove extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_REMOVE)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_REMOVE)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return true; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Save.java b/Core/src/main/java/com/plotsquared/core/command/Save.java index 1cfa55d1b..c15647fdc 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Save.java +++ b/Core/src/main/java/com/plotsquared/core/command/Save.java @@ -28,7 +28,6 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotId; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; @@ -82,8 +81,7 @@ public class Save extends SubCommand { player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_SAVE)) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_SAVE)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java index 0a495e987..550a0cf93 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java @@ -30,7 +30,6 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.schematic.Schematic; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.TabCompletions; @@ -80,7 +79,7 @@ public class SchematicCmd extends SubCommand { String arg = args[0].toLowerCase(); switch (arg) { case "paste" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) { + if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_PASTE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_PASTE)) @@ -104,8 +103,7 @@ public class SchematicCmd extends SubCommand { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, "plots.admin.command.schematic.paste")) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission("plots.admin.command.schematic.paste")) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } @@ -218,7 +216,7 @@ public class SchematicCmd extends SubCommand { } } case "export", "save" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) { + if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_SAVE)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE)) @@ -243,8 +241,7 @@ public class SchematicCmd extends SubCommand { player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large")); return false; } - if (!plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, "plots.admin.command.schematic.save")) { + if (!plot.isOwner(player.getUUID()) && !player.hasPermission("plots.admin.command.schematic.save")) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return false; } @@ -261,7 +258,7 @@ public class SchematicCmd extends SubCommand { } } case "list" -> { - if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) { + if (!player.hasPermission(Permission.PERMISSION_SCHEMATIC_LIST)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_LIST)) @@ -286,13 +283,13 @@ public class SchematicCmd extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) { + if (player.hasPermission(Permission.PERMISSION_SCHEMATIC_SAVE)) { completions.add("save"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) { + if (player.hasPermission(Permission.PERMISSION_SCHEMATIC_LIST)) { completions.add("list"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) { + if (player.hasPermission(Permission.PERMISSION_SCHEMATIC_PASTE)) { completions.add("paste"); } final List commands = completions.stream().filter(completion -> completion @@ -307,7 +304,7 @@ public class SchematicCmd extends SubCommand { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_SCHEMATIC) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Set.java b/Core/src/main/java/com/plotsquared/core/command/Set.java index e12ab3505..84ec87eeb 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Set.java +++ b/Core/src/main/java/com/plotsquared/core/command/Set.java @@ -32,7 +32,6 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotManager; import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.util.PatternUtil; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.WorldUtil; @@ -96,7 +95,7 @@ public class Set extends SubCommand { BlockType::getName).toList()); } - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_ALLOW_UNSAFE) && + if (!player.hasPermission(Permission.PERMISSION_ADMIN_ALLOW_UNSAFE) && !forbiddenTypes.isEmpty()) { for (String forbiddenType : forbiddenTypes) { forbiddenType = forbiddenType.toLowerCase(Locale.ENGLISH); @@ -132,7 +131,7 @@ public class Set extends SubCommand { for (String component : components) { if (component.equalsIgnoreCase(args[0])) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) { + if (!player.hasPermission(Permission.PERMISSION_SET_COMPONENT.format(component))) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_SET_COMPONENT.format(component)) @@ -211,7 +210,7 @@ public class Set extends SubCommand { } Command cmd = MainCommand.getInstance().getCommand("set" + args[0]); if (cmd != null) { - if (!Permissions.hasPermission(player, cmd.getPermission(), true)) { + if (!player.hasPermission(cmd.getPermission(), true)) { return false; } cmd.execute(player, Arrays.copyOfRange(args, 1, args.length), null, null); @@ -241,37 +240,37 @@ public class Set extends SubCommand { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_BIOME)) { + if (player.hasPermission(Permission.PERMISSION_SET_BIOME)) { completions.add("biome"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_ALIAS)) { + if (player.hasPermission(Permission.PERMISSION_SET_ALIAS)) { completions.add("alias"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_HOME)) { + if (player.hasPermission(Permission.PERMISSION_SET_HOME)) { completions.add("home"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_MAIN)) { + if (player.hasPermission(Permission.PERMISSION_SET_MAIN)) { completions.add("main"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_FLOOR)) { + if (player.hasPermission(Permission.PERMISSION_SET_FLOOR)) { completions.add("floor"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_AIR)) { + if (player.hasPermission(Permission.PERMISSION_SET_AIR)) { completions.add("air"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_ALL)) { + if (player.hasPermission(Permission.PERMISSION_SET_ALL)) { completions.add("all"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_BORDER)) { + if (player.hasPermission(Permission.PERMISSION_SET_BORDER)) { completions.add("border"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_WALL)) { + if (player.hasPermission(Permission.PERMISSION_SET_WALL)) { completions.add("wall"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_OUTLINE)) { + if (player.hasPermission(Permission.PERMISSION_SET_OUTLINE)) { completions.add("outline"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_SET_MIDDLE)) { + if (player.hasPermission(Permission.PERMISSION_SET_MIDDLE)) { completions.add("middle"); } final List commands = completions.stream().filter(completion -> completion @@ -280,7 +279,7 @@ public class Set extends SubCommand { .map(completion -> new Command(null, true, completion, "", RequiredType.NONE, CommandCategory.APPEARANCE) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_SET) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_SET) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; @@ -296,7 +295,7 @@ public class Set extends SubCommand { final Command cmd = MainCommand.getInstance().getCommand("set" + args[0]); if (cmd != null) { - if (!Permissions.hasPermission(player, cmd.getPermission(), true)) { + if (!player.hasPermission(cmd.getPermission(), true)) { return new ArrayList<>(); } return cmd.tab(player, newArgs, space); diff --git a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java index 1ff54853c..2189a0eae 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java @@ -23,7 +23,6 @@ import com.plotsquared.core.location.Location; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringMan; import net.kyori.adventure.text.minimessage.Template; @@ -38,7 +37,7 @@ public abstract class SetCommand extends SubCommand { return false; } if (!plot.hasOwner()) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())) @@ -48,7 +47,7 @@ public abstract class SetCommand extends SubCommand { } } if (!plot.isOwner(player.getUUID())) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND.format(getFullId()))) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_ADMIN_COMMAND.format(getFullId())) diff --git a/Core/src/main/java/com/plotsquared/core/command/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java index 4c7864439..d97437d89 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Swap.java +++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java @@ -23,7 +23,6 @@ import com.plotsquared.core.location.Location; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal2; import com.plotsquared.core.util.task.RunnableVal3; import net.kyori.adventure.text.minimessage.Template; @@ -49,8 +48,7 @@ public class Swap extends SubCommand { player.sendMessage(TranslatableCaption.of("errors.not_in_plot")); return CompletableFuture.completedFuture(false); } - if (!plot1.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN)) { + if (!plot1.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return CompletableFuture.completedFuture(false); } diff --git a/Core/src/main/java/com/plotsquared/core/command/Template.java b/Core/src/main/java/com/plotsquared/core/command/Template.java index 02b95e71f..9f05d8aff 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Template.java +++ b/Core/src/main/java/com/plotsquared/core/command/Template.java @@ -39,7 +39,6 @@ import com.plotsquared.core.setup.PlotAreaBuilder; import com.plotsquared.core.setup.SettingsNodesWrapper; import com.plotsquared.core.util.FileBytes; import com.plotsquared.core.util.FileUtils; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.SetupUtils; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.WorldUtil; @@ -279,10 +278,10 @@ public class Template extends SubCommand { public Collection tab(final PlotPlayer player, final String[] args, final boolean space) { if (args.length == 1) { final List completions = new LinkedList<>(); - if (Permissions.hasPermission(player, Permission.PERMISSION_TEMPLATE_EXPORT)) { + if (player.hasPermission(Permission.PERMISSION_TEMPLATE_EXPORT)) { completions.add("export"); } - if (Permissions.hasPermission(player, Permission.PERMISSION_TEMPLATE_IMPORT)) { + if (player.hasPermission(Permission.PERMISSION_TEMPLATE_IMPORT)) { completions.add("import"); } final List commands = completions.stream().filter(completion -> completion @@ -297,7 +296,7 @@ public class Template extends SubCommand { CommandCategory.ADMINISTRATION ) { }).collect(Collectors.toCollection(LinkedList::new)); - if (Permissions.hasPermission(player, Permission.PERMISSION_TEMPLATE) && args[0].length() > 0) { + if (player.hasPermission(Permission.PERMISSION_TEMPLATE) && args[0].length() > 0) { commands.addAll(TabCompletions.completePlayers(player, args[0], Collections.emptyList())); } return commands; diff --git a/Core/src/main/java/com/plotsquared/core/command/Trust.java b/Core/src/main/java/com/plotsquared/core/command/Trust.java index 63c5e9a94..b44eec0e0 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Trust.java +++ b/Core/src/main/java/com/plotsquared/core/command/Trust.java @@ -27,7 +27,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.task.RunnableVal2; @@ -69,8 +68,7 @@ public class Trust extends Command { } checkTrue(currentPlot.hasOwner(), TranslatableCaption.of("info.plot_unowned")); checkTrue( - currentPlot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST), + currentPlot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST), TranslatableCaption.of("permission.no_plot_perms") ); @@ -101,8 +99,7 @@ public class Trust extends Command { while (iterator.hasNext()) { UUID uuid = iterator.next(); if (uuid == DBFunc.EVERYONE && !( - Permissions.hasPermission(player, Permission.PERMISSION_TRUST_EVERYONE) || Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { + player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) { player.sendMessage( TranslatableCaption.of("errors.invalid_player"), Template.of("value", PlayerManager.resolveName(uuid).getComponent(player)) @@ -130,7 +127,7 @@ public class Trust extends Command { } checkTrue(!uuids.isEmpty(), null); int localTrustSize = currentPlot.getTrusted().size(); - int maxTrustSize = Permissions.hasPermissionRange(player, Permission.PERMISSION_TRUST, Settings.Limit.MAX_PLOTS); + int maxTrustSize = player.hasPermissionRange(Permission.PERMISSION_TRUST, Settings.Limit.MAX_PLOTS); if (localTrustSize >= maxTrustSize) { player.sendMessage( TranslatableCaption.of("members.plot_max_members_trusted"), diff --git a/Core/src/main/java/com/plotsquared/core/command/Unlink.java b/Core/src/main/java/com/plotsquared/core/command/Unlink.java index f0aec660d..45d49c6c3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Unlink.java +++ b/Core/src/main/java/com/plotsquared/core/command/Unlink.java @@ -27,7 +27,6 @@ import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.task.TaskManager; import net.kyori.adventure.text.minimessage.Template; @@ -91,8 +90,7 @@ public class Unlink extends SubCommand { return true; } boolean force = event.getEventResult() == Result.FORCE; - if (!force && !plot.isOwner(player.getUUID()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_UNLINK)) { + if (!force && !plot.isOwner(player.getUUID()) && !player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_UNLINK)) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); return true; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Visit.java b/Core/src/main/java/com/plotsquared/core/command/Visit.java index e287fa589..c20edeba8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Visit.java +++ b/Core/src/main/java/com/plotsquared/core/command/Visit.java @@ -31,7 +31,6 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.TabCompletions; import com.plotsquared.core.util.query.PlotQuery; @@ -108,7 +107,7 @@ public class Visit extends Command { final Plot plot = plots.get(page - 1); if (!plot.hasOwner()) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_UNOWNED)) { + if (!player.hasPermission(Permission.PERMISSION_VISIT_UNOWNED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.visit.unowned") @@ -116,8 +115,7 @@ public class Visit extends Command { return; } } else if (plot.isOwner(player.getUUID())) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OWNED) && !Permissions - .hasPermission(player, Permission.PERMISSION_HOME)) { + if (!player.hasPermission(Permission.PERMISSION_VISIT_OWNED) && !player.hasPermission(Permission.PERMISSION_HOME)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.visit.owned") @@ -125,7 +123,7 @@ public class Visit extends Command { return; } } else if (plot.isAdded(player.getUUID())) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_SHARED)) { + if (!player.hasPermission(Permission.PERMISSION_SHARED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.visit.shared") @@ -135,8 +133,8 @@ public class Visit extends Command { } else { // allow visit, if UntrustedVisit flag is set, or if the player has either the plot.visit.other or // plot.admin.visit.untrusted permission - if (!plot.getFlag(UntrustedVisitFlag.class) && !Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OTHER) - && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) { + if (!plot.getFlag(UntrustedVisitFlag.class) && !player.hasPermission(Permission.PERMISSION_VISIT_OTHER) + && !player.hasPermission(Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Templates.of("node", "plots.visit.other") @@ -144,7 +142,7 @@ public class Visit extends Command { return; } if (plot.isDenied(player.getUUID())) { - if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) { + if (!player.hasPermission(Permission.PERMISSION_VISIT_DENIED)) { player.sendMessage( TranslatableCaption.of("permission.no_permission"), Template.of("node", String.valueOf(Permission.PERMISSION_VISIT_DENIED)) diff --git a/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java b/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java index 710b6c283..88dc48672 100644 --- a/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java +++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java @@ -35,7 +35,6 @@ import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.InventoryUtil; import com.plotsquared.core.util.PatternUtil; -import com.plotsquared.core.util.Permissions; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.item.ItemTypes; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -51,7 +50,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -153,8 +151,7 @@ public class ComponentPresetManager { } else if (!plot.hasOwner()) { player.sendMessage(TranslatableCaption.of("info.plot_unowned")); return null; - } else if (!plot.isOwner(player.getUUID()) && !plot.getTrusted().contains(player.getUUID()) && !Permissions.hasPermission( - player, + } else if (!plot.isOwner(player.getUUID()) && !plot.getTrusted().contains(player.getUUID()) && !player.hasPermission( Permission.PERMISSION_ADMIN_COMPONENTS_OTHER )) { player.sendMessage(TranslatableCaption.of("permission.no_plot_perms")); @@ -166,8 +163,7 @@ public class ComponentPresetManager { final List allowedPresets = new ArrayList<>(this.presets.size()); for (final ComponentPreset componentPreset : this.presets) { - if (!componentPreset.getPermission().isEmpty() && !Permissions.hasPermission( - player, + if (!componentPreset.getPermission().isEmpty() && !player.hasPermission( componentPreset.getPermission() )) { continue; diff --git a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java index 0550d65eb..59f1b0d24 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java +++ b/Core/src/main/java/com/plotsquared/core/listener/PlotListener.java @@ -56,7 +56,6 @@ import com.plotsquared.core.plot.flag.implementations.TitlesFlag; import com.plotsquared.core.plot.flag.implementations.WeatherFlag; import com.plotsquared.core.plot.flag.types.TimedFlag; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.task.TaskTime; @@ -149,8 +148,7 @@ public class PlotListener { } public boolean plotEntry(final PlotPlayer player, final Plot plot) { - if (plot.isDenied(player.getUUID()) && !Permissions - .hasPermission(player, "plots.admin.entry.denied")) { + if (plot.isDenied(player.getUUID()) && !player.hasPermission("plots.admin.entry.denied")) { player.sendMessage( TranslatableCaption.of("deny.no_enter"), Template.of("plot", plot.toString()) @@ -188,7 +186,7 @@ public class PlotListener { } if (plot.getFlag(NotifyEnterFlag.class)) { - if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) { + if (!player.hasPermission("plots.flag.notify-enter.bypass")) { for (UUID uuid : plot.getOwners()) { final PlotPlayer owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid); if (owner != null && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) { @@ -200,7 +198,7 @@ public class PlotListener { } final FlyFlag.FlyStatus flyStatus = plot.getFlag(FlyFlag.class); - if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_FLIGHT)) { + if (!player.hasPermission(Permission.PERMISSION_ADMIN_FLIGHT)) { if (flyStatus != FlyFlag.FlyStatus.DEFAULT) { boolean flight = player.getFlight(); GameMode gamemode = player.getGameMode(); @@ -216,7 +214,7 @@ public class PlotListener { final GameMode gameMode = plot.getFlag(GamemodeFlag.class); if (!gameMode.equals(GamemodeFlag.DEFAULT)) { if (player.getGameMode() != gameMode) { - if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) { + if (!player.hasPermission("plots.gamemode.bypass")) { player.setGameMode(gameMode); } else { player.sendMessage( @@ -231,7 +229,7 @@ public class PlotListener { final GameMode guestGameMode = plot.getFlag(GuestGamemodeFlag.class); if (!guestGameMode.equals(GamemodeFlag.DEFAULT)) { if (player.getGameMode() != guestGameMode && !plot.isAdded(player.getUUID())) { - if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) { + if (!player.hasPermission("plots.gamemode.bypass")) { player.setGameMode(guestGameMode); } else { player.sendMessage( @@ -392,8 +390,7 @@ public class PlotListener { } try (final MetaDataAccess kickAccess = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) { - if (plot.getFlag(DenyExitFlag.class) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_EXIT_DENIED) && + if (plot.getFlag(DenyExitFlag.class) && !player.hasPermission(Permission.PERMISSION_ADMIN_EXIT_DENIED) && !kickAccess.get().orElse(false)) { if (previous != null) { lastPlot.set(previous); @@ -404,7 +401,7 @@ public class PlotListener { if (!plot.getFlag(GamemodeFlag.class).equals(GamemodeFlag.DEFAULT) || !plot .getFlag(GuestGamemodeFlag.class).equals(GamemodeFlag.DEFAULT)) { if (player.getGameMode() != pw.getGameMode()) { - if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) { + if (!player.hasPermission("plots.gamemode.bypass")) { player.setGameMode(pw.getGameMode()); } else { player.sendMessage( @@ -426,7 +423,7 @@ public class PlotListener { } if (plot.getFlag(NotifyLeaveFlag.class)) { - if (!Permissions.hasPermission(player, "plots.flag.notify-leave.bypass")) { + if (!player.hasPermission("plots.flag.notify-leave.bypass")) { for (UUID uuid : plot.getOwners()) { final PlotPlayer owner = PlotSquared.platform().playerManager().getPlayerIfExists(uuid); if ((owner != null) && !owner.getUUID().equals(player.getUUID()) && owner.canSee(player)) { diff --git a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java index 0ad71a737..493863a07 100644 --- a/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java @@ -25,7 +25,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.world.PlotAreaManager; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.WEManager; import com.plotsquared.core.util.WorldUtil; import com.sk89q.worldedit.EditSession; @@ -92,7 +91,7 @@ public class WESubscriber { } else { mask = WEManager.getMask(plotPlayer); if (mask.isEmpty()) { - if (Permissions.hasPermission(plotPlayer, "plots.worldedit.bypass")) { + if (plotPlayer.hasPermission("plots.worldedit.bypass")) { plotPlayer.sendMessage( TranslatableCaption.of("worldedit.worldedit_bypass"), Template.of("command", "/plot toggle worldedit") diff --git a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java index ed79cbdc9..3b483f45b 100644 --- a/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java +++ b/Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java @@ -38,6 +38,16 @@ public interface PermissionHolder { return hasPermission(null, permission); } + /** + * Check if the owner of the profile has a given (global) permission + * + * @param permission Permission + * @return {@code true} if the owner has the given permission, else {@code false} + */ + default boolean hasPermission(final @NonNull Permission permission) { + return hasPermission(permission.toString()); + } + /** * Check if the owner of the profile has a given (global) keyed permission. Checks both {@code permission.key} * and {@code permission.*} @@ -54,6 +64,23 @@ public interface PermissionHolder { return hasKeyedPermission(null, permission, key); } + /** + * Check the highest permission a PlotPlayer has within a specified range.
+ * - Excessively high values will lag
+ * - The default range that is checked is {@link Settings.Limit#MAX_PLOTS}
+ * + * @param stub The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot` + * @param range The range to check + * @return The highest permission they have within that range + */ + @NonNegative + default int hasPermissionRange( + final @NonNull Permission stub, + @NonNegative final int range + ) { + return hasPermissionRange(stub.toString(), range); + } + /** * Check the highest permission a PlotPlayer has within a specified range.
* - Excessively high values will lag
@@ -92,6 +119,26 @@ public interface PermissionHolder { return 0; } + /** + * Checks if the owner of the profile has a permission, and optionally send the no permission message if applicable. + * + * @param permission Permission + * @param notify If to notify the permission holder + * @return {@code true} if the owner has the given permission, else {@code false} + */ + default boolean hasPermission(@NonNull Permission permission, boolean notify) { + return hasPermission(permission.toString(), notify); + } + + /** + * Checks if the owner of the profile has a permission, and optionally send the no permission message if applicable. + * + * @param permission Permission + * @param notify If to notify the permission holder + * @return {@code true} if the owner has the given permission, else {@code false} + */ + boolean hasPermission(@NonNull String permission, boolean notify); + /** * Check if the owner of the profile has a given permission * diff --git a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java index f0d5cdfc3..29c487526 100644 --- a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java @@ -48,7 +48,6 @@ import com.plotsquared.core.plot.world.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotAreaManager; import com.plotsquared.core.synchronization.LockRepository; import com.plotsquared.core.util.EventDispatcher; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.query.PlotQuery; import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; @@ -200,6 +199,20 @@ public abstract class PlotPlayer

implements CommandCaller, OfflinePlotPlayer, return this.permissionProfile.hasKeyedPermission(world, permission, key); } + @Override + public final boolean hasPermission(@NonNull String permission, boolean notify) { + if (!hasPermission(permission)) { + if (notify) { + sendMessage( + TranslatableCaption.of("permission.no_permission_event"), + Template.of("node", permission) + ); + } + return false; + } + return true; + } + public abstract Actor toActor(); public abstract P getPlatformPlayer(); @@ -290,7 +303,7 @@ public abstract class PlotPlayer

implements CommandCaller, OfflinePlotPlayer, * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml) */ public int getAllowedPlots() { - return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS); + return hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS); } /** diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java index bab1a3d61..5c90c2fad 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java @@ -54,7 +54,6 @@ import com.plotsquared.core.plot.world.SinglePlotArea; import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlayerManager; import com.plotsquared.core.util.RegionManager; import com.plotsquared.core.util.RegionUtil; @@ -2207,7 +2206,7 @@ public class Plot { public boolean canClaim(@NonNull PlotPlayer player) { PlotCluster cluster = this.getCluster(); if (cluster != null) { - if (!cluster.isAdded(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.claim")) { + if (!cluster.isAdded(player.getUUID()) && !player.hasPermission("plots.admin.command.claim")) { return false; } } @@ -2598,7 +2597,7 @@ public class Plot { Template plotTemplate = Template.of("plot", this.toString()); Template messageTemplate = Template.of("message", message); for (final PlotPlayer player : players) { - if (isOwner(player.getUUID()) || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_DEBUG_OTHER)) { + if (isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_DEBUG_OTHER)) { player.sendMessage(caption, plotTemplate, messageTemplate); } } @@ -2635,8 +2634,7 @@ public class Plot { return; } final Consumer locationConsumer = location -> { - if (Settings.Teleport.DELAY == 0 || Permissions - .hasPermission(player, "plots.teleport.delay.bypass")) { + if (Settings.Teleport.DELAY == 0 || player.hasPermission("plots.teleport.delay.bypass")) { player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot")); player.teleport(location, cause); resultConsumer.accept(true); diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index 63f5577ba..b9b805f82 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -49,7 +49,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.RegionUtil; import com.plotsquared.core.util.StringMan; @@ -646,7 +645,7 @@ public abstract class PlotArea { * @since 6.9.1 */ public boolean notifyIfOutsideBuildArea(PlotPlayer player, int y) { - if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + if (!buildRangeContainsY(y) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { player.sendMessage( TranslatableCaption.of("height.height_limit"), Template.of("minHeight", String.valueOf(minBuildHeight)), diff --git a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java index ac9185bfe..1e0894538 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java @@ -21,7 +21,6 @@ package com.plotsquared.core.plot.comment; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.task.RunnableVal; import java.util.List; @@ -37,9 +36,8 @@ public abstract class CommentInbox { * @return the inbox, otherwise {@code false} false */ public boolean canRead(Plot plot, PlotPlayer player) { - if (Permissions.hasPermission(player, "plots.inbox.read." + this, true)) { - return plot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, "plots.inbox.read." + this + ".other", true); + if (player.hasPermission("plots.inbox.read." + this, true)) { + return plot.isOwner(player.getUUID()) || player.hasPermission("plots.inbox.read." + this + ".other", true); } return false; } @@ -51,11 +49,10 @@ public abstract class CommentInbox { */ public boolean canWrite(Plot plot, PlotPlayer player) { if (plot == null) { - return Permissions.hasPermission(player, "plots.inbox.write." + this, true); + return player.hasPermission("plots.inbox.write." + this, true); } - return Permissions.hasPermission(player, "plots.inbox.write." + this, true) && ( - plot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, "plots.inbox.write." + this + ".other", true)); + return player.hasPermission("plots.inbox.write." + this, true) && ( + plot.isOwner(player.getUUID()) || player.hasPermission("plots.inbox.write." + this + ".other", true)); } /** @@ -65,9 +62,8 @@ public abstract class CommentInbox { */ @SuppressWarnings({"BooleanMethodIsAlwaysInverted"}) public boolean canModify(Plot plot, PlotPlayer player) { - if (Permissions.hasPermission(player, "plots.inbox.modify." + this, true)) { - return plot.isOwner(player.getUUID()) || Permissions - .hasPermission(player, "plots.inbox.modify." + this + ".other", true); + if (player.hasPermission("plots.inbox.modify." + this, true)) { + return plot.isOwner(player.getUUID()) || player.hasPermission("plots.inbox.modify." + this + ".other", true); } return false; } diff --git a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index b2d858b4d..9318cccd0 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -332,8 +332,7 @@ public class EventDispatcher { ) { PlotArea area = location.getPlotArea(); assert area != null; - if (!area.buildRangeContainsY(location.getY()) && !Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + if (!area.buildRangeContainsY(location.getY()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { player.sendMessage( TranslatableCaption.of("height.height_limit"), Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), @@ -360,12 +359,12 @@ public class EventDispatcher { return true; } } - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms ); } if (!plot.hasOwner()) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms ); } @@ -376,7 +375,7 @@ public class EventDispatcher { return true; } } - if (Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) { + if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) { return true; } if (notifyPerms) { @@ -395,12 +394,12 @@ public class EventDispatcher { return true; } } - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false ); } if (!plot.hasOwner()) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false ); } @@ -414,19 +413,19 @@ public class EventDispatcher { return true; } } - return Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), - false - ); + return player.hasPermission( + Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), + false + ); } case SPAWN_MOB: { if (plot == null) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms ); } if (!plot.hasOwner()) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms ); } @@ -440,10 +439,10 @@ public class EventDispatcher { return true; } } - if (Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), - false - )) { + if (player.hasPermission( + Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), + false + )) { return true; } if (notifyPerms) { @@ -457,12 +456,12 @@ public class EventDispatcher { } case PLACE_MISC: { if (plot == null) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms ); } if (!plot.hasOwner()) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms ); } @@ -476,10 +475,10 @@ public class EventDispatcher { return true; } } - if (Permissions - .hasPermission(player, Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), - false - )) { + if (player.hasPermission( + Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), + false + )) { return true; } if (notifyPerms) { @@ -493,12 +492,12 @@ public class EventDispatcher { } case PLACE_VEHICLE: if (plot == null) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms ); } if (!plot.hasOwner()) { - return Permissions.hasPermission(player, + return player.hasPermission( Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms ); } diff --git a/Core/src/main/java/com/plotsquared/core/util/Permissions.java b/Core/src/main/java/com/plotsquared/core/util/Permissions.java index 06d0ddbee..972653a8b 100644 --- a/Core/src/main/java/com/plotsquared/core/util/Permissions.java +++ b/Core/src/main/java/com/plotsquared/core/util/Permissions.java @@ -32,14 +32,14 @@ import org.checkerframework.checker.nullness.qual.NonNull; * - Checking the PlotPlayer class directly will not take the above into account
* * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes */ @Deprecated(forRemoval = true, since = "6.9.3") public class Permissions { /** * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PlotPlayer#hasPermission(String, boolean)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static boolean hasPermission(PlotPlayer player, Permission permission, boolean notify) { @@ -53,7 +53,7 @@ public class Permissions { * @param permission Permission * @return {@code true} if the owner has the given permission, else {@code false} * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PermissionHolder#hasPermission(Permission)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull Permission permission) { @@ -68,7 +68,7 @@ public class Permissions { * @param permission Permission * @return {@code true} if the owner has the given permission, else {@code false} * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PermissionHolder#hasPermission(String)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull String permission) { @@ -85,7 +85,7 @@ public class Permissions { * @return {@code true} if the owner has the given permission, else {@code false} * @since 6.0.10 * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PermissionHolder#hasKeyedPermission(String, String)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static boolean hasKeyedPermission( @@ -103,7 +103,7 @@ public class Permissions { * @param notify if to notify the permission holder * @return if permission is had * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PlotPlayer#hasPermission(String, boolean)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static boolean hasPermission(PlotPlayer player, String permission, boolean notify) { @@ -121,7 +121,7 @@ public class Permissions { /** * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PlotPlayer#hasPermissionRange(Permission, int)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static int hasPermissionRange(PlotPlayer player, Permission Permission, int range) { @@ -138,7 +138,7 @@ public class Permissions { * @param range The range to check * @return The highest permission they have within that range * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed - * classes + * classes. Use {@link PlotPlayer#hasPermissionRange(String, int)} */ @Deprecated(forRemoval = true, since = "6.9.3") public static int hasPermissionRange(PlotPlayer player, String stub, int range) {