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

3.18.2.0

Browse Source
This commit is contained in:
rockyhawk64 2022-10-27 09:29:46 +11:00
parent b3662984f9
commit 6ed1b170f6
4 changed files with 18 additions and 9 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.18.1.4 version: 3.18.2.0
main: me.rockyhawk.commandpanels.CommandPanels main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels name: CommandPanels
author: RockyHawk author: RockyHawk

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

@ -239,7 +239,7 @@ public class CommandTags {
//create the item to be removed //create the item to be removed
ItemStack sellItem; ItemStack sellItem;
if(command.split("\\s").length == 2) { if(Material.matchMaterial(command.split("\\s")[1]) == null) {
sellItem = plugin.itemCreate.makeCustomItemFromConfig(panel,PanelPosition.Top,panel.getConfig().getConfigurationSection("custom-item." + command.split("\\s")[1]), p, true, true, false); sellItem = plugin.itemCreate.makeCustomItemFromConfig(panel,PanelPosition.Top,panel.getConfig().getConfigurationSection("custom-item." + command.split("\\s")[1]), p, true, true, false);
}else{ }else{
sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[1])), Integer.parseInt(command.split("\\s")[2]), id); sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[1])), Integer.parseInt(command.split("\\s")[2]), id);
@ -255,15 +255,19 @@ public class CommandTags {
continue; continue;
} }
if(command.split("\\s").length == 2){ if(Material.matchMaterial(command.split("\\s")[1]) == null){
//if item paywall is custom item //item-paywall is a custom item as it is not a material
if(plugin.itemCreate.isIdentical(sellItem,cont.get(f))){ if(plugin.itemCreate.isIdentical(sellItem,cont.get(f))){
if (sellItem.getAmount() <= cont.get(f).getAmount()) { int sellItemAmount = sellItem.getAmount();
if(command.split("\\s").length == 3){
sellItemAmount = Integer.parseInt(command.split("\\s")[2]);
}
if (sellItemAmount <= cont.get(f).getAmount()) {
if (plugin.inventorySaver.hasNormalInventory(p)) { if (plugin.inventorySaver.hasNormalInventory(p)) {
p.getInventory().getItem(f).setAmount(cont.get(f).getAmount() - sellItem.getAmount()); p.getInventory().getItem(f).setAmount(cont.get(f).getAmount() - sellItemAmount);
p.updateInventory(); p.updateInventory();
} else { } else {
cont.get(f).setAmount(cont.get(f).getAmount() - sellItem.getAmount()); cont.get(f).setAmount(cont.get(f).getAmount() - sellItemAmount);
plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0]))); plugin.inventorySaver.inventoryConfig.set(p.getUniqueId().toString(), plugin.itemSerializer.itemStackArrayToBase64(cont.toArray(new ItemStack[0])));
} }
removedItem = PaywallOutput.Passed; removedItem = PaywallOutput.Passed;

5
src/me/rockyhawk/commandpanels/commandtags/tags/standard/BasicTags.java
View File

@ -26,6 +26,11 @@ public class BasicTags implements Listener {
if(e.name.equalsIgnoreCase("cpc") || e.name.equalsIgnoreCase("commandpanelclose")){ if(e.name.equalsIgnoreCase("cpc") || e.name.equalsIgnoreCase("commandpanelclose")){
e.commandTagUsed(); e.commandTagUsed();
//return if no panel open
if(!plugin.openPanels.hasPanelOpen(e.p.getName(),PanelPosition.Top)){
return;
}
//unclosable panels are at the Top only //unclosable panels are at the Top only
if(plugin.openPanels.getOpenPanel(e.p.getName(),PanelPosition.Top).getConfig().contains("panelType")){ if(plugin.openPanels.getOpenPanel(e.p.getName(),PanelPosition.Top).getConfig().contains("panelType")){
if(plugin.openPanels.getOpenPanel(e.p.getName(),PanelPosition.Top).getConfig().getStringList("panelType").contains("unclosable")){ if(plugin.openPanels.getOpenPanel(e.p.getName(),PanelPosition.Top).getConfig().getStringList("panelType").contains("unclosable")){

4
src/me/rockyhawk/commandpanels/commandtags/tags/standard/BungeeTags.java
View File

@ -19,7 +19,7 @@ public class BungeeTags implements Listener {
public void commandTag(CommandTagEvent e){ public void commandTag(CommandTagEvent e){
if(e.name.equalsIgnoreCase("force-server=")){ if(e.name.equalsIgnoreCase("force-server=")){
e.commandTagUsed(); e.commandTagUsed();
//this contacts bungee and tells it to send the server change command //this contacts bungee and tells it to send the server change command without checking permissions
ByteArrayDataOutput out = ByteStreams.newDataOutput(); ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("Connect"); out.writeUTF("Connect");
out.writeUTF(e.args[0]); out.writeUTF(e.args[0]);
@ -31,7 +31,7 @@ public class BungeeTags implements Listener {
Player player = Bukkit.getPlayerExact(e.p.getName()); Player player = Bukkit.getPlayerExact(e.p.getName());
assert player != null; assert player != null;
if (player.hasPermission("bungeecord.command.server." + e.args[0].toLowerCase())) { if (player.hasPermission("bungeecord.command.server." + e.args[0].toLowerCase())) {
//this contacts bungee and tells it to send the server change command //this contacts bungee and tells it to send the server change command whilst checking for permissions
ByteArrayDataOutput out = ByteStreams.newDataOutput(); ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("Connect"); out.writeUTF("Connect");
out.writeUTF(e.args[0]); out.writeUTF(e.args[0]);