Serialized GUI to avoid issues with other plugin's GUI's.

This commit is contained in:
Aust1n46 2016-09-08 12:47:10 -04:00
parent 750948ffd8
commit 7c307fa71b
2 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@ public class VentureChatGui extends MineverseCommand {
return; return;
} }
if(args.length < 3) { if(args.length < 3) {
sender.sendMessage(ChatColor.RED + "Invalid command: /venturechatgui [player] [channel] [hash]"); sender.sendMessage(ChatColor.RED + "Invalid command: " + command+ " [player] [channel] [hash]");
return; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
@ -83,7 +83,7 @@ public class VentureChatGui extends MineverseCommand {
} }
private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target, ChatChannel channel, int hash) { private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target, ChatChannel channel, int hash) {
Inventory inv = Bukkit.createInventory(null, this.getSlots(), target.getName() + " GUI"); Inventory inv = Bukkit.createInventory(null, this.getSlots(), "VentureChat: " + target.getName() + " GUI");
ItemStack close = new ItemStack(Material.BARRIER); ItemStack close = new ItemStack(Material.BARRIER);
ItemMeta closeMeta = close.getItemMeta(); ItemMeta closeMeta = close.getItemMeta();
closeMeta.setDisplayName("§oClose GUI"); closeMeta.setDisplayName("§oClose GUI");

View File

@ -263,12 +263,12 @@ public class CommandListener implements CommandExecutor, Listener {
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void InventoryClick(InventoryClickEvent e) { public void InventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem(); ItemStack item = e.getCurrentItem();
if(item == null || !e.getInventory().getTitle().contains("GUI")) { if(item == null || !e.getInventory().getTitle().contains("VentureChat") && !e.getInventory().getTitle().contains("GUI")) {
return; return;
} }
e.setCancelled(true); e.setCancelled(true);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) e.getWhoClicked()); MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) e.getWhoClicked());
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(e.getInventory().getTitle().replace(" GUI", "")); MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(e.getInventory().getTitle().replace(" GUI", "").replace("VentureChat: ", ""));
ItemStack skull = e.getInventory().getItem(0); ItemStack skull = e.getInventory().getItem(0);
SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); SkullMeta skullMeta = (SkullMeta) skull.getItemMeta();
ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(ChatColor.stripColor(skullMeta.getLore().get(0)).replace("Channel: ", "")); ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(ChatColor.stripColor(skullMeta.getLore().get(0)).replace("Channel: ", ""));