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

3.16.2.3

Browse Source
This commit is contained in:
rockyhawk64 2021-07-15 21:22:17 +10:00
parent c3274d7193
commit 6aa3593a3f
8 changed files with 13 additions and 10 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.16.2.2
version: 3.16.2.3
main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels
author: RockyHawk

4
src/me/rockyhawk/commandpanels/CommandPanels.java
View File

@ -271,9 +271,7 @@ public class CommandPanels extends JavaPlugin{
//save files
panelData.saveDataFile();
inventorySaver.saveInventoryFile();
if (Objects.requireNonNull(this.config.getString("updater.auto-update")).equalsIgnoreCase("true")) {
updater.autoUpdatePlugin(this.getFile().getName());
}
updater.autoUpdatePlugin(this.getFile().getName());
Bukkit.getLogger().info("RockyHawk's CommandPanels Plugin Disabled, aww man.");
}

1
src/me/rockyhawk/commandpanels/api/Panel.java
View File

@ -4,6 +4,7 @@ import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.classresources.placeholders.PanelPlaceholders;
import me.rockyhawk.commandpanels.openpanelsmanager.PanelOpenType;
import me.rockyhawk.commandpanels.openpanelsmanager.PanelPosition;
import org.bukkit.Bukkit;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;

6
src/me/rockyhawk/commandpanels/commands/Commandpanel.java
View File

@ -58,7 +58,7 @@ public class Commandpanel implements CommandExecutor {
return true;
}else if(args.length == 3){
if (args[1].equals("item")) {
plugin.openVoids.giveHotbarItem(sender,plugin.getServer().getPlayer(args[2]),panel,true);
plugin.openVoids.giveHotbarItem(sender,plugin.getServer().getPlayer(args[2]),panel.copy(),true);
}else{
sender.sendMessage(plugin.tex.colour(plugin.tag + ChatColor.RED + "Usage: /cp <panel> item [player]"));
}
@ -78,7 +78,7 @@ public class Commandpanel implements CommandExecutor {
return true;
}else if(args.length == 2){
if (args[1].equals("item")) {
plugin.openVoids.giveHotbarItem(sender, p, panel, false);
plugin.openVoids.giveHotbarItem(sender, p, panel.copy(), false);
}else{
if(!disableCommand) {
plugin.openVoids.openCommandPanel(sender, plugin.getServer().getPlayer(args[1]), panel.copy(),PanelPosition.Top, true);
@ -86,7 +86,7 @@ public class Commandpanel implements CommandExecutor {
}
return true;
}else if(args.length == 3){
plugin.openVoids.giveHotbarItem(sender, plugin.getServer().getPlayer(args[2]), panel,true);
plugin.openVoids.giveHotbarItem(sender, plugin.getServer().getPlayer(args[2]), panel.copy(),true);
return true;
}
}

2
src/me/rockyhawk/commandpanels/customcommands/Commandpanelcustom.java
View File

@ -24,7 +24,7 @@ public class Commandpanelcustom implements Listener {
for(String cmd : panelCommands){
if(cmd.equalsIgnoreCase(e.getMessage().replace("/", ""))){
e.setCancelled(true);
panel.open(e.getPlayer(), PanelPosition.Top);
panel.copy().open(e.getPlayer(), PanelPosition.Top);
return;
}

2
src/me/rockyhawk/commandpanels/openwithitem/HotbarPlayerManager.java
View File

@ -15,6 +15,6 @@ public class HotbarPlayerManager {
}
public Panel getPanel(int slot){
return list.get(slot);
return list.get(slot).copy();
}
}

2
src/me/rockyhawk/commandpanels/openwithitem/SwapItemEvent.java
View File

@ -12,7 +12,7 @@ public class SwapItemEvent implements Listener {
this.plugin = pl;
}
@EventHandler
public void onPlayerSwapHandItemsEvent​(PlayerSwapHandItemsEvent e){
public void onPlayerSwapHandItemsEvent(PlayerSwapHandItemsEvent e){
if(!plugin.openWithItem){
//if none of the panels have open-with-item
return;

4
src/me/rockyhawk/commandpanels/updater/Updater.java
View File

@ -119,6 +119,10 @@ public class Updater implements Listener {
//no need to update or running custom version
return;
}
if (Objects.requireNonNull(plugin.config.getString("updater.auto-update")).equalsIgnoreCase("true")) {
//don't update the plugin automatically if it is disabled
return;
}
if(Objects.equals(plugin.config.getString("updater.minor-updates-only"), "true")){
//only update versions that will not break
if(thisVersion.split("\\.")[1].equals(latestVersion.split("\\.")[1]) && thisVersion.split("\\.")[0].equals(latestVersion.split("\\.")[0])){