From 66da534f28bd7771b9f129182664477a8581abba Mon Sep 17 00:00:00 2001 From: Adrigamer2950 Date: Wed, 21 Aug 2024 14:15:35 +0200 Subject: [PATCH 1/3] refactor: Remove warnings --- src/main/java/gg/playit/minecraft/PlayitBukkit.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/gg/playit/minecraft/PlayitBukkit.java b/src/main/java/gg/playit/minecraft/PlayitBukkit.java index e9757f4..f8fcff8 100644 --- a/src/main/java/gg/playit/minecraft/PlayitBukkit.java +++ b/src/main/java/gg/playit/minecraft/PlayitBukkit.java @@ -52,8 +52,7 @@ public void onEnable() { try { PluginManager pm = Bukkit.getServer().getPluginManager(); pm.registerEvents(this, this); - } catch (Exception e) { - } + } catch (Exception ignored) {} } @EventHandler @@ -93,7 +92,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St if (manager == null) { String currentSecret = getConfig().getString(CFG_AGENT_SECRET_KEY); - if (currentSecret == null || currentSecret.length() == 0) { + if (currentSecret == null || currentSecret.isEmpty()) { sender.sendMessage(CFG_AGENT_SECRET_KEY + " is not set"); } else { sender.sendMessage("playit status: offline (or shutting down)"); @@ -281,7 +280,7 @@ public List onTabComplete(CommandSender sender, Command command, String } int argCount = args.length; - if (argCount != 0 && args[argCount - 1].length() == 0) { + if (argCount != 0 && args[argCount - 1].isEmpty()) { argCount -= 1; } From f9dadcb209344ef5a7ae71e220c443aafd52366b Mon Sep 17 00:00:00 2001 From: Adrigamer2950 Date: Wed, 21 Aug 2024 14:15:58 +0200 Subject: [PATCH 2/3] feat: Admin permission --- src/main/java/gg/playit/minecraft/PlayitBukkit.java | 4 ++-- src/main/resources/plugin.yml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/gg/playit/minecraft/PlayitBukkit.java b/src/main/java/gg/playit/minecraft/PlayitBukkit.java index f8fcff8..7ed7ff7 100644 --- a/src/main/java/gg/playit/minecraft/PlayitBukkit.java +++ b/src/main/java/gg/playit/minecraft/PlayitBukkit.java @@ -81,8 +81,8 @@ public void broadcast(String message) { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!sender.isOp()) { - sender.sendMessage("OP required"); + if (!sender.hasPermission("playit.admin")) { + sender.sendMessage("Permission/OP required"); return true; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5a3018b..c5b20a0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -9,5 +9,7 @@ commands: playit: description: Configure playit.gg usage: /playit - permission: Operators - permission-message: You must be a server operator to run the playit command + +permissions: + playit.admin: + default: op From 23bc00086d8e724aa9656f0a3805c2c947181f4f Mon Sep 17 00:00:00 2001 From: Adrigamer2950 Date: Wed, 21 Aug 2024 14:16:07 +0200 Subject: [PATCH 3/3] feat: Add support for Folia --- src/main/resources/plugin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c5b20a0..47781c3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,6 +4,7 @@ main: gg.playit.minecraft.PlayitBukkit author: https://playit.gg description: Makes your server public so friends can connect api-version: 1.18 +folia-supported: true commands: playit: