Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

Merge pull request #243 from jman13378/jman13378-patch-1

Browse Source 
Double paywall send
This commit is contained in:
RockyHawk 2022-12-27 22:14:14 +11:00 committed by GitHub
commit f3744a2bf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java
View File

@ -96,6 +96,9 @@ public class Placeholders {
case("online-players"): { case("online-players"): {
return Integer.toString(Bukkit.getServer().getOnlinePlayers().size()); return Integer.toString(Bukkit.getServer().getOnlinePlayers().size());
} }
case("online-players-true"): {
return Integer.toString(Bukkit.getOnlinePlayers().stream().filter(player -> !player.getMetadata("vanished").get(0).asBoolean()).collect(Collectors.toList()).size());
}
case("panel-position"): { case("panel-position"): {
return position.toString(); return position.toString();
} }
@ -323,6 +326,15 @@ public class Placeholders {
//checks for players online //checks for players online
if(identifier.startsWith("player-online-")) { if(identifier.startsWith("player-online-")) {
try { try {
if (identifier.endsWith("-true")){
String playerLocation = identifier.replace("player-online-", "");
Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().stream().filter(player -> !player.getMetadata("vanished").get(0).asBoolean()).collect(Collectors.toList()).size()]);
if (Double.parseDouble(playerLocation) > playerFind.length) {
return plugin.tex.colour(Objects.requireNonNull(plugin.config.getString("config.format.offline")));
} else {
return playerFind[(int)(Double.parseDouble(playerLocation) - 1)].getName();
}
} else {
String playerLocation = identifier.replace("player-online-", ""); String playerLocation = identifier.replace("player-online-", "");
Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]); Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]);
if (Double.parseDouble(playerLocation) > playerFind.length) { if (Double.parseDouble(playerLocation) > playerFind.length) {
@ -330,6 +342,7 @@ public class Placeholders {
} else { } else {
return playerFind[(int)(Double.parseDouble(playerLocation) - 1)].getName(); return playerFind[(int)(Double.parseDouble(playerLocation) - 1)].getName();
} }
}
}catch (Exception ex){ }catch (Exception ex){
plugin.debug(ex,p); plugin.debug(ex,p);
return ""; return "";

2
src/me/rockyhawk/commandpanels/commandtags/CommandTags.java
View File

@ -181,7 +181,7 @@ public class CommandTags {
if(plugin.config.getBoolean("purchase.tokens.enable")){ if(plugin.config.getBoolean("purchase.tokens.enable")){
plugin.tex.sendString(panel, PanelPosition.Top, p, Objects.requireNonNull(plugin.config.getString("purchase.tokens.success")).replaceAll("%cp-args%", command.split("\\s")[1])); plugin.tex.sendString(panel, PanelPosition.Top, p, Objects.requireNonNull(plugin.config.getString("purchase.tokens.success")).replaceAll("%cp-args%", command.split("\\s")[1]));
} }
plugin.tex.sendString(panel, PanelPosition.Top, p, Objects.requireNonNull(plugin.config.getString("purchase.tokens.success")).replaceAll("%cp-args%", command.split("\\s")[1]));
return PaywallOutput.Passed; return PaywallOutput.Passed;
} else { } else {
if(plugin.config.getBoolean("purchase.tokens.enable")){ if(plugin.config.getBoolean("purchase.tokens.enable")){