From 4f2a6bfcb84fea9f8f9d38600c13197118685fa8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 24 Jan 2018 00:00:15 +0500 Subject: [PATCH] Add armor & offhand functionality to invsee --- .../command/Command_invsee.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java index 480bd151..56892ba0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java @@ -6,9 +6,10 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = " Look into another player's inventory, optionally take items out.", usage = "/ ", aliases = "inv,insee") +@CommandParameters(description = " Look into another player's inventory, optionally take items out.", usage = "/ [offhand, armor]", aliases = "inv,insee") public class Command_invsee extends FreedomCommand { @@ -16,9 +17,8 @@ public class Command_invsee extends FreedomCommand public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length != 1) + if (args.length < 1) { - msg("You need to specify a player."); return false; } @@ -40,14 +40,37 @@ public class Command_invsee extends FreedomCommand { msg("You can't spy on admins!"); return true; - } + } + if(args.length >= 2) + { + if (args[1].equals("offhand")) + { + ItemStack offhand = player.getInventory().getItemInOffHand(); + if (offhand == null) + { + msg("That player has nothing in their offhand."); + return true; + } + Inventory inventory = server.createInventory(null, 1, player.getName() + "'s offhand"); + inventory.setItem(1, offhand); + playerSender.openInventory(inventory); + return true; + } + if (args[1].equals("armor")) + { + Inventory inventory = server.createInventory(null, 9, player.getName() + "'s armor"); + inventory.setContents(player.getInventory().getArmorContents()); + playerSender.openInventory(inventory); + return true; + } + } playerSender.closeInventory(); FPlayer fPlayer = plugin.pl.getPlayer(playerSender); - fPlayer.setInvSee(true); + fPlayer.setInvsee(true); Inventory playerInv = player.getInventory(); playerSender.openInventory(playerInv); return true; } - } +