From f957066cbce7c95a6fb9e218a5141f623075831a Mon Sep 17 00:00:00 2001 From: Gabo6480 <60194781+Gabo6480@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:23:51 -0500 Subject: [PATCH 1/2] Simple 2 argument yes/no version This version is a simplified version that just uses the argument and the argument, returning 'yes' if they have the permission, or 'no' otherwise. --- .../me/aBooDyy/relconexpansion/RelConExpansion.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java b/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java index 8a19791..6f17ad3 100644 --- a/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java +++ b/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java @@ -39,6 +39,18 @@ public String onPlaceholderRequest(Player p1, Player p2, String identifier) { if (args.length == 4) noPerm = args[3].replaceAll("\\{nl}", "\n"); + if (args.length == 2) { + switch (args[0]) { + case "viewer": + return p2.hasPermission(args[1]) ? 'yes' : 'no'; + break; + case "player": + return p1.hasPermission(args[1]) ? 'yes' : 'no'; + break; + } + return null; + } + if (args.length >= 3) { args[2] = args[2].replaceAll("\\{nl}", "\n"); switch (args[0]) { From 675a6b6486aa324ee5fcb6d0b88ad936da2c86cc Mon Sep 17 00:00:00 2001 From: Gabo6480 <60194781+Gabo6480@users.noreply.github.com> Date: Thu, 21 Jul 2022 11:51:15 -0500 Subject: [PATCH 2/2] Update RelConExpansion.java Instead of static 'yes' 'no' strings as a result, it now uses PlaceholderAPIPlugin.booleanTrue() and PlaceholderAPIPlugin.booleanFalse(). --- src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java b/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java index 6f17ad3..a7b7d12 100644 --- a/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java +++ b/src/main/java/me/aBooDyy/relconexpansion/RelConExpansion.java @@ -42,10 +42,10 @@ public String onPlaceholderRequest(Player p1, Player p2, String identifier) { if (args.length == 2) { switch (args[0]) { case "viewer": - return p2.hasPermission(args[1]) ? 'yes' : 'no'; + return p2.hasPermission(args[1]) ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse(); break; case "player": - return p1.hasPermission(args[1]) ? 'yes' : 'no'; + return p1.hasPermission(args[1]) ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse(); break; } return null;