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

3.8.3 Fixes

Browse Source
This commit is contained in:
rockyhawk64 2020-08-11 22:47:15 +10:00
parent bcf1734b76
commit 4dfef8cb7b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/plugin.yml
View File

@ -1,4 +1,4 @@
version: 3.8.2 version: 3.8.3
main: me.rockyhawk.commandPanels.commandpanels main: me.rockyhawk.commandPanels.commandpanels
name: CommandPanels name: CommandPanels
author: RockyHawk author: RockyHawk

17
src/me/rockyhawk/commandPanels/commandpanels.java
View File

@ -437,14 +437,16 @@ public class commandpanels extends JavaPlugin {
//papi except if it is a String List //papi except if it is a String List
public List<String> papi(Player p, List<String> setpapi, boolean placeholders) { public List<String> papi(Player p, List<String> setpapi, boolean placeholders) {
try { try {
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI") && placeholders) { if(placeholders) {
int tempInt = 0; int tempInt = 0;
for(String temp : setpapi){ for (String temp : setpapi) {
setpapi.set(tempInt,setCpPlaceholders(p,temp)); setpapi.set(tempInt, setCpPlaceholders(p, temp));
tempInt += 1; tempInt += 1;
} }
OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId()); if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi); OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId());
setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi);
}
} }
}catch(Exception ignore){ }catch(Exception ignore){
//this will be ignored as it is probably a null //this will be ignored as it is probably a null
@ -465,6 +467,11 @@ public class commandpanels extends JavaPlugin {
//papi except if it is a String List //papi except if it is a String List
public List<String> papiNoColour(Player p, List<String> setpapi) { public List<String> papiNoColour(Player p, List<String> setpapi) {
try { try {
int tempInt = 0;
for (String temp : setpapi) {
setpapi.set(tempInt, setCpPlaceholders(p, temp));
tempInt += 1;
}
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId()); OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId());
setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi); setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi);