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

3.7.3 Fixes

Browse Source
This commit is contained in:
rockyhawk64 2020-08-04 16:18:52 +10:00
parent 183761812a
commit cba5975f76
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/libraries/PlaceholderAPI_2_10_21.xml → .idea/libraries/PlaceholderAPI_2_10_8.xml
View File

@ -1,7 +1,7 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="PlaceholderAPI-2.10.21"> <library name="PlaceholderAPI-2.10.8">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/PlaceholderAPI-2.10.2.jar!/" /> <root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/PlaceholderAPI-2.10.8.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
Command Panels.iml
View File

@ -9,10 +9,10 @@
<orderEntry type="jdk" jdkName="adopt-openjdk-1.8" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="adopt-openjdk-1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="HeadDatabaseAPI" level="project" /> <orderEntry type="library" name="HeadDatabaseAPI" level="project" />
<orderEntry type="library" name="PlaceholderAPI-2.10.21" level="project" />
<orderEntry type="library" name="TokenManager-3.2.4" level="project" /> <orderEntry type="library" name="TokenManager-3.2.4" level="project" />
<orderEntry type="library" name="Vault" level="project" /> <orderEntry type="library" name="Vault" level="project" />
<orderEntry type="library" name="VotingPlugin" level="project" /> <orderEntry type="library" name="VotingPlugin" level="project" />
<orderEntry type="library" name="spigot-1.16.1" level="project" /> <orderEntry type="library" name="spigot-1.16.1" level="project" />
<orderEntry type="library" name="PlaceholderAPI-2.10.8" level="project" />
</component> </component>
</module> </module>

2
resource/plugin.yml
View File

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

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

@ -398,7 +398,8 @@ public class commandpanels extends JavaPlugin {
try { try {
setpapi = setCpPlaceholders(p,setpapi); setpapi = setCpPlaceholders(p,setpapi);
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
setpapi = PlaceholderAPI.setPlaceholders(p, setpapi); OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId());
setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi);
} }
setpapi = translateHexColorCodes(ChatColor.translateAlternateColorCodes('&', setpapi)); setpapi = translateHexColorCodes(ChatColor.translateAlternateColorCodes('&', setpapi));
return setpapi; return setpapi;
@ -412,7 +413,8 @@ public class commandpanels extends JavaPlugin {
try { try {
setpapi = setCpPlaceholders(p,setpapi); setpapi = setCpPlaceholders(p,setpapi);
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
setpapi = PlaceholderAPI.setPlaceholders(p, setpapi); OfflinePlayer offp = getServer().getOfflinePlayer(p.getUniqueId());
setpapi = PlaceholderAPI.setPlaceholders(offp, setpapi);
} }
return setpapi; return setpapi;
}catch(NullPointerException e){ }catch(NullPointerException e){
@ -434,7 +436,8 @@ public class commandpanels extends JavaPlugin {
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 (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI") && placeholders) {
setpapi = PlaceholderAPI.setPlaceholders(p, 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
@ -456,7 +459,8 @@ public class commandpanels extends JavaPlugin {
public List<String> papiNoColour(Player p, List<String> setpapi) { public List<String> papiNoColour(Player p, List<String> setpapi) {
try { try {
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
setpapi = PlaceholderAPI.setPlaceholders(p, 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
@ -1817,9 +1821,7 @@ public class commandpanels extends JavaPlugin {
outputValue = cf.getBoolean("panels." + panelName + ".item." + slot + ".hasperm" + count + ".output"); outputValue = cf.getBoolean("panels." + panelName + ".item." + slot + ".hasperm" + count + ".output");
} }
if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + slot + ".hasperm" + count + ".perm"))) == outputValue) { if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + slot + ".hasperm" + count + ".perm"))) == outputValue) {
if (cf.contains("panels." + panelName + ".item." + slot + ".hasperm" + count + ".commands")) { return ".hasperm" + count;
return ".hasperm" + count;
}
} }
} }
} }
@ -1831,9 +1833,7 @@ public class commandpanels extends JavaPlugin {
outputValue = cf.getBoolean("panels." + panelName + ".item." + slot + ".hasperm" + ".output"); outputValue = cf.getBoolean("panels." + panelName + ".item." + slot + ".hasperm" + ".output");
} }
if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + slot + ".hasperm.perm"))) == outputValue) { if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + slot + ".hasperm.perm"))) == outputValue) {
if (cf.contains("panels." + panelName + ".item." + slot + ".hasperm.commands")) { return ".hasperm";
return ".hasperm";
}
} }
} }
return ""; return "";