Skip to content

Commit 864bd24

Browse files
author
david
committed
added permission constants
1 parent 1960162 commit 864bd24

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

src/main/java/net/onelitefeather/bettergopaint/BetterGoPaint.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ public class BetterGoPaint extends JavaPlugin implements Listener {
5151

5252
public static final @NotNull String PAPER_DOCS = "https://jd.papermc.io/paper/1.20.6/org/bukkit/Material.html#enum-constant-summary";
5353

54+
public static final @NotNull String USE_PERMISSION = "bettergopaint.use";
55+
public static final @NotNull String ADMIN_PERMISSION = "bettergopaint.admin";
56+
public static final @NotNull String RELOAD_PERMISSION = "bettergopaint.command.admin.reload";
57+
public static final @NotNull String WORLD_BYPASS_PERMISSION = "bettergopaint.world.bypass";
58+
5459
private final @NotNull PlayerBrushManager brushManager = new PlayerBrushManager();
5560
private final @NotNull Metrics metrics = new Metrics(this, 18734);
5661

src/main/java/net/onelitefeather/bettergopaint/command/GoPaintCommand.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public boolean execute(
5050
}
5151
PlayerBrush pb = plugin.getBrushManager().getBrush(p);
5252
String prefix = Settings.settings().GENERIC.PREFIX;
53-
if (!p.hasPermission("bettergopaint.use")) {
53+
if (!p.hasPermission(BetterGoPaint.USE_PERMISSION)) {
5454
p.sendRichMessage(prefix + "<red>You are lacking the permission bettergopaint.use");
5555
return true;
5656
}
5757
if (args.length == 0) {
58-
if (p.hasPermission("bettergopaint.admin")) {
58+
if (p.hasPermission(BetterGoPaint.ADMIN_PERMISSION)) {
5959
p.sendRichMessage(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>|<red>reload");
6060
return true;
6161
}
@@ -75,7 +75,7 @@ public boolean execute(
7575
}
7676
return true;
7777
} else if ((args[0].equalsIgnoreCase("reload") || args[0].equalsIgnoreCase("r")) && p.hasPermission(
78-
"bettergopaint.admin")) {
78+
BetterGoPaint.ADMIN_PERMISSION)) {
7979
plugin.reloadConfig();
8080
p.sendRichMessage(prefix + "<green>Reloaded");
8181
return true;
@@ -84,7 +84,7 @@ public boolean execute(
8484
p.sendRichMessage(prefix + "<aqua>Links: <gold><click:open_url:https://twitter.com/themeinerlp'><u>Twitter</u></click>");
8585
return true;
8686
}
87-
if (p.hasPermission("bettergopaint.admin")) {
87+
if (p.hasPermission(BetterGoPaint.ADMIN_PERMISSION)) {
8888
p.sendRichMessage(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>|<red>reload");
8989
return true;
9090
}
@@ -102,7 +102,7 @@ public boolean execute(
102102
return true;
103103
}
104104
}
105-
if (p.hasPermission("bettergopaint.admin")) {
105+
if (p.hasPermission(BetterGoPaint.ADMIN_PERMISSION)) {
106106
p.sendRichMessage(prefix + "<red>/gp size<gray>|<red>toggle<gray>|<red>info<gray>|<red>reload");
107107
return true;
108108
}

src/main/java/net/onelitefeather/bettergopaint/command/ReloadCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ReloadCommand(final BetterGoPaint betterGoPaint) {
3232
}
3333

3434
@Command("bgp|gp reload")
35-
@Permission("bettergopaint.command.admin.reload")
35+
@Permission(BetterGoPaint.RELOAD_PERMISSION)
3636
public void onReload(Player player) {
3737
betterGoPaint.reloadConfig();
3838
}

src/main/java/net/onelitefeather/bettergopaint/listeners/InteractListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public InteractListener(BetterGoPaint plugin) {
5252
public void onClick(PlayerInteractEvent event) {
5353
Player player = event.getPlayer();
5454

55-
if (!player.hasPermission("bettergopaint.use")) {
55+
if (!player.hasPermission(BetterGoPaint.USE_PERMISSION)) {
5656
return;
5757
}
5858

@@ -85,7 +85,7 @@ public void onClick(PlayerInteractEvent event) {
8585
return;
8686
}
8787

88-
if (!player.hasPermission("bettergopaint.world.bypass") && Settings.settings().GENERIC.DISABLED_WORLDS
88+
if (!player.hasPermission(BetterGoPaint.WORLD_BYPASS_PERMISSION) && Settings.settings().GENERIC.DISABLED_WORLDS
8989
.contains(location.getWorld().getName())) {
9090
return;
9191
}

0 commit comments

Comments
 (0)