Fixed all Offline OpenInv related bugs. Thanks to Balor/Belphemur for the most part of the code.

.classpath

@@ -5,7 +5,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Orebfuscator"/>
 	<classpathentry kind="lib" path="D:/Dropbox/Projects/Workspace/bukkit.jar" sourcepath="D:/Dropbox/Projects/Workspace/Bukkit-Source.zip"/>
 	<classpathentry kind="lib" path="D:/Dropbox/Projects/Workspace/craftbukkit.jar" sourcepath="D:/Dropbox/Projects/Workspace/CraftBukkit-source.zip"/>
-	<classpathentry kind="lib" path="D:/Dropbox/Projects/Workspace/FakePermissions.jar"/>
 	<classpathentry kind="lib" path="D:/Dropbox/Projects/Workspace/Spout.jar" sourcepath="D:/Dropbox/Projects/Workspace/Spout.zip"/>
 	<classpathentry kind="lib" path="D:/Dropbox/Projects/Workspace/SpoutAPI.jar" sourcepath="D:/Dropbox/Projects/Workspace/SpoutAPI.zip"/>
 	<classpathentry kind="output" path="bin"/>

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-#Tue Apr 26 23:51:01 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

src/lishid/openinv/OpenInv.java

@@ -16,8 +16,11 @@
 
 package lishid.openinv;
 
+import java.util.HashMap;
+
 import lishid.openinv.commands.*;
 import lishid.openinv.utils.Metrics;
+import lishid.openinv.utils.OpenInvPlayerInventory;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -30,16 +33,22 @@ import org.bukkit.plugin.java.JavaPlugin;
  * 
  * @author lishid
  */
-public class OpenInv extends JavaPlugin {
+public class OpenInv extends JavaPlugin
+{
     private final OpenInvPlayerListener playerListener = new OpenInvPlayerListener(this);
     private final OpenInvEntityListener entityListener = new OpenInvEntityListener(this);
+    public static HashMap<String, OpenInvPlayerInventory> inventories = new HashMap<String, OpenInvPlayerInventory>();
     public static OpenInv mainPlugin;
     private static Metrics metrics;
     
-    public void onDisable() {
+    public void onDisable()
+    {
+        PluginDescriptionFile pdfFile = this.getDescription();
+        System.out.println("[" + pdfFile.getName() + "] version " + pdfFile.getVersion() + " disabled!");
     }
     
-    public void onEnable() {
+    public void onEnable()
+    {
         mainPlugin = this;
         mainPlugin.getConfig().addDefault("ItemOpenInvItemID", 280);
         mainPlugin.getConfig().options().copyDefaults(true);
@@ -49,7 +58,6 @@ public class OpenInv extends JavaPlugin {
         pm.registerEvents(playerListener, this);
         pm.registerEvents(entityListener, this);
         
-
         getCommand("openinv").setExecutor(new OpenInvPluginCommand(this));
         getCommand("searchinv").setExecutor(new SearchInvPluginCommand(this));
         getCommand("toggleopeninv").setExecutor(new ToggleOpenInvPluginCommand());
@@ -62,7 +70,10 @@ public class OpenInv extends JavaPlugin {
             metrics = new Metrics(this);
             metrics.start();
         }
-		catch(Exception e){ e.printStackTrace(); }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
         
         PluginDescriptionFile pdfFile = this.getDescription();
         System.out.println("[" + pdfFile.getName() + "] version " + pdfFile.getVersion() + " enabled!");

src/lishid/openinv/OpenInvEntityListener.java

@@ -24,15 +24,20 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-public class OpenInvEntityListener implements Listener{
+public class OpenInvEntityListener implements Listener
+{
     OpenInv plugin;
-	public OpenInvEntityListener(OpenInv scrap) {
+    
+    public OpenInvEntityListener(OpenInv scrap)
+    {
         plugin = scrap;
     }
     
     @EventHandler(priority = EventPriority.LOWEST)
-	public void onEntityDamage(EntityDamageEvent event) {
+    public void onEntityDamage(EntityDamageEvent event)
-        if (event instanceof EntityDamageByEntityEvent) {
+    {
+        if (event instanceof EntityDamageByEntityEvent)
+        {
             EntityDamageByEntityEvent evt = (EntityDamageByEntityEvent) event;
             Entity attacker = evt.getDamager();
             Entity defender = evt.getEntity();
@@ -44,9 +49,7 @@ public class OpenInvEntityListener implements Listener{
             
             Player player = (Player) attacker;
             
-    		if(!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem())
+            if (!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem()) || (!OpenInv.GetPlayerItemOpenInvStatus(player.getName())) || !player.hasPermission("OpenInv.openinv"))
-    				|| (!OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
-    				|| !player.hasPermission("OpenInv.openinv"))
             {
                 return;
             }

src/lishid/openinv/OpenInvPlayerListener.java

@@ -18,14 +18,13 @@ package lishid.openinv;
 
 import java.lang.reflect.Field;
 
-import lishid.openinv.commands.OpenInvPluginCommand;
+import lishid.openinv.utils.OpenInvPlayerInventory;
 import lishid.openinv.utils.SilentContainerChest;
 import net.minecraft.server.Block;
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.IInventory;
 import net.minecraft.server.InventoryLargeChest;
 import net.minecraft.server.Packet100OpenWindow;
-import net.minecraft.server.Packet101CloseWindow;
 import net.minecraft.server.TileEntityChest;
 import net.minecraft.server.World;
 
@@ -40,31 +39,38 @@ import org.bukkit.event.Event.Result;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
-public class OpenInvPlayerListener implements Listener{
+public class OpenInvPlayerListener implements Listener
+{
     OpenInv plugin;
-	public OpenInvPlayerListener(OpenInv scrap) {
+    
-		plugin = scrap;
+    public OpenInvPlayerListener(OpenInv plugin)
+    {
+        this.plugin = plugin;
     }
     
     @EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerLogin(PlayerLoginEvent event)
+    public void onPlayerJoin(PlayerJoinEvent event)
     {
-		try{
+        OpenInvPlayerInventory inventory = OpenInv.inventories.get(event.getPlayer().getName().toLowerCase());
-			for(Player target : OpenInvPluginCommand.offlineInv.keySet())
+        
+        if (inventory != null)
         {
-				if(target.getName().equalsIgnoreCase(event.getPlayer().getName()))
+            inventory.PlayerGoOnline((CraftPlayer) event.getPlayer());
-				{
-					((CraftPlayer)OpenInvPluginCommand.offlineInv.get(target).Opener).getHandle().netServerHandler.sendPacket(new Packet101CloseWindow());
-					target.saveData();
-					OpenInvPluginCommand.offlineInv.remove(target);
-					event.getPlayer().loadData();
-					return;
         }
     }
+    
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerQuit(PlayerQuitEvent event)
+    {
+        OpenInvPlayerInventory inventory = OpenInv.inventories.get(event.getPlayer().getName().toLowerCase());
+        if(inventory != null)
+        {
+            inventory.PlayerGoOffline();
+            inventory.InventoryRemovalCheck();
         }
-		catch(Exception e){}
     }
     
     @EventHandler(priority = EventPriority.MONITOR)
@@ -120,21 +126,31 @@ public class OpenInvPlayerListener implements Listener{
                 EntityPlayer player = ((CraftPlayer) event.getPlayer()).getHandle();
                 World world = player.world;
                 Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
-		        if (chest == null) return;
+                if (chest == null)
+                    return;
                 
                 if (!anychest)
                 {
-			        if (world.e(x, y + 1, z)) return;
+                    if (world.e(x, y + 1, z))
-			        if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.e(x - 1, y + 1, z))) return;
+                        return;
-			        if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.e(x + 1, y + 1, z))) return;
+                    if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.e(x - 1, y + 1, z)))
-			        if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.e(x, y + 1, z - 1))) return;
+                        return;
-			        if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.e(x, y + 1, z + 1))) return;
+                    if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.e(x + 1, y + 1, z)))
+                        return;
+                    if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.e(x, y + 1, z - 1)))
+                        return;
+                    if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.e(x, y + 1, z + 1)))
+                        return;
                 }
                 
-		        if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (TileEntityChest)world.getTileEntity(x - 1, y, z), (IInventory)chest);
+                if (world.getTypeId(x - 1, y, z) == Block.CHEST.id)
-		        if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (IInventory)chest, (TileEntityChest)world.getTileEntity(x + 1, y, z));
+                    chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
-		        if (world.getTypeId(x, y, z - 1) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (TileEntityChest)world.getTileEntity(x, y, z - 1), (IInventory)chest);
+                if (world.getTypeId(x + 1, y, z) == Block.CHEST.id)
-		        if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (IInventory)chest, (TileEntityChest)world.getTileEntity(x, y, z + 1));
+                    chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x + 1, y, z));
+                if (world.getTypeId(x, y, z - 1) == Block.CHEST.id)
+                    chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
+                if (world.getTypeId(x, y, z + 1) == Block.CHEST.id)
+                    chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
                 
                 if (!silentchest)
                 {
@@ -142,9 +158,11 @@ public class OpenInvPlayerListener implements Listener{
                 }
                 else
                 {
-		        	try{
+                    try
+                    {
                         int id = 0;
-			        	try{
+                        try
+                        {
                             Field windowID = player.getClass().getDeclaredField("containerCounter");
                             windowID.setAccessible(true);
                             id = windowID.getInt(player);
@@ -152,7 +170,8 @@ public class OpenInvPlayerListener implements Listener{
                             windowID.setInt(player, id);
                         }
                         catch (NoSuchFieldException e)
-			        	{ }
+                        {
+                        }
                         
                         player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
                         player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
@@ -177,7 +196,8 @@ public class OpenInvPlayerListener implements Listener{
         if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getState() instanceof Sign)
         {
             Player player = event.getPlayer();
-			try{
+            try
+            {
                 Sign sign = ((Sign) event.getClickedBlock().getState());
                 if (player.hasPermission("OpenInv.openinv") && sign.getLine(0).equalsIgnoreCase("[openinv]"))
                 {
@@ -196,9 +216,7 @@ public class OpenInvPlayerListener implements Listener{
         {
             Player player = event.getPlayer();
             
-			if(!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem())
+            if (!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem()) || (!OpenInv.GetPlayerItemOpenInvStatus(player.getName())) || !player.hasPermission("OpenInv.openinv"))
-    				|| (!OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
-					|| !player.hasPermission("OpenInv.openinv"))
             {
                 return;
             }

src/lishid/openinv/commands/AnyChestPluginCommand.java

@@ -24,18 +24,22 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class AnyChestPluginCommand implements CommandExecutor {
+public class AnyChestPluginCommand implements CommandExecutor
-    public AnyChestPluginCommand(OpenInv plugin) {
+{
+    public AnyChestPluginCommand(OpenInv plugin)
+    {
         
     }
     
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+    {
         if (!(sender instanceof Player))
         {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
             return true;
         }
-    	if (!sender.hasPermission("OpenInv.anychest")) {
+        if (!sender.hasPermission("OpenInv.anychest"))
+        {
             sender.sendMessage(ChatColor.RED + "You do not have permission to use anychest.");
             return true;
         }

src/lishid/openinv/commands/OpenInvPluginCommand.java

@@ -17,10 +17,12 @@
 package lishid.openinv.commands;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 
 import lishid.openinv.OpenInv;
-import lishid.openinv.utils.PlayerInventoryChest;
+import lishid.openinv.utils.OpenInvPlayerInventory;
 
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.ItemInWorldManager;
@@ -35,21 +37,26 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-public class OpenInvPluginCommand implements CommandExecutor {
+public class OpenInvPluginCommand implements CommandExecutor
+{
     private final OpenInv plugin;
-    public static HashMap<Player, PlayerInventoryChest> offlineInv = new HashMap<Player, PlayerInventoryChest>();
+    public static HashMap<Player, OpenInvPlayerInventory> offlineInv = new HashMap<Player, OpenInvPlayerInventory>();
     public static HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
-    public OpenInvPluginCommand(OpenInv plugin) {
+    
+    public OpenInvPluginCommand(OpenInv plugin)
+    {
         this.plugin = plugin;
     }
     
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+    {
         if (!(sender instanceof Player))
         {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
             return true;
         }
-    	if (!sender.hasPermission("OpenInv.openinv")) {
+        if (!sender.hasPermission("OpenInv.openinv"))
+        {
             sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
             return true;
         }
@@ -61,7 +68,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
         }
         
         Player player = (Player) sender;
-    	boolean Offline = false;
+        boolean offline = false;
         
         // History management
         String history = openInvHistory.get(player);
@@ -78,7 +85,8 @@ public class OpenInvPluginCommand implements CommandExecutor {
         String name = "";
         
         // Read from history if target is not named
-		if (args.length < 1) {
+        if (args.length < 1)
+        {
             if (history != null && history != "")
             {
                 name = history;
@@ -99,39 +107,46 @@ public class OpenInvPluginCommand implements CommandExecutor {
         if (target == null)
         {
             // Offline inv here...
-			try{
+            try
+            {
                 // See if the player has data files
                 
-				// Find the player folder
+                // Go through current world first, if not found then go through default world.
+                /*
+                 * World worldFound = matchWorld(Bukkit.getWorlds(), player.getWorld().getName());
+                 * if (worldFound != null)
+                 * {
+                 * 
+                 * }
+                 */
+                
+                // Default player folder
                 File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
-
+                if (!playerfolder.exists())
-				// Find player name
-				for (File playerfile : playerfolder.listFiles())
                 {
-					String filename = playerfile.getName();
+                    sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
-					String playername = filename.substring(0, filename.length() - 4);
+                    return true;
+                }
                 
-					if(playername.trim().equalsIgnoreCase(name))
+                String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
+                if (playername == null)
                 {
+                    sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
+                    return true;
+                }
+                
                 // Create an entity to load the player data
-						MinecraftServer server = ((CraftServer)this.plugin.getServer()).getServer();
+                final MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
-						EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername, new ItemInWorldManager(server.getWorldServer(0)));
+                final EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername, new ItemInWorldManager(server.getWorldServer(0)));
                 target = (entity == null) ? null : (Player) entity.getBukkitEntity();
                 if (target != null)
                 {
-							Offline = true;
                     target.loadData();
+                    offline = true;
                 }
                 else
                 {
-							sender.sendMessage(ChatColor.RED + "Player not found!");
+                    sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
-							return true;
-						}
-					}
-				}
-				if(!Offline)
-				{
-					sender.sendMessage(ChatColor.RED + "Player not found!");
                     return true;
                 }
             }
@@ -144,13 +159,14 @@ public class OpenInvPluginCommand implements CommandExecutor {
         }
         
         // Permissions checks
-		if (!player.hasPermission("OpenInv.override") && target.hasPermission("OpenInv.exempt")) {
+        if (!player.hasPermission("OpenInv.override") && target.hasPermission("OpenInv.exempt"))
+        {
             sender.sendMessage(ChatColor.RED + target.getDisplayName() + "'s inventory is protected!");
             return true;
         }
         
-		if((!player.hasPermission("OpenInv.crossworld") && !player.hasPermission("OpenInv.override")) && 
+        if ((!player.hasPermission("OpenInv.crossworld") && !player.hasPermission("OpenInv.override")) && target.getWorld() != player.getWorld())
-				target.getWorld() != player.getWorld()){
+        {
             sender.sendMessage(ChatColor.RED + target.getDisplayName() + " is not in your world!");
             return true;
         }
@@ -159,29 +175,53 @@ public class OpenInvPluginCommand implements CommandExecutor {
         history = target.getName();
         openInvHistory.put(player, history);
         
-		//Get the EntityPlayer handle from the sender
-		EntityPlayer entityplayer = ((CraftPlayer) player).getHandle();
-
-		//Get the EntityPlayer from the Target
-		EntityPlayer entitytarget = ((CraftPlayer) target).getHandle();
-		
         // Create the inventory
-		PlayerInventoryChest inv = new PlayerInventoryChest(entitytarget.inventory, entitytarget);
+        OpenInvPlayerInventory inv = OpenInv.inventories.get(target.getName().toLowerCase());
-		
+        if (inv == null)
-		//Save data into the inventory for tracking
-		inv.Opener = player;
-		inv.Target = target;
-		
-		//Saves offline openinv
-		if(Offline)
         {
-			inv.Offline = true;
+            inv = new OpenInvPlayerInventory((CraftPlayer) target, !offline);
-			offlineInv.put(target, inv);
+            
+            OpenInv.inventories.put(target.getName().toLowerCase(), inv);
         }
         
         // Open the inventory
-		entityplayer.openContainer(inv);
+        (((CraftPlayer) player).getHandle()).openContainer(inv);
         
         return true;
     }
+    
+    /**
+     * @author Balor (aka Antoine Aflalo)
+     */
+    private String matchUser(final Collection<File> container, final String search)
+    {
+        String found = null;
+        if (search == null)
+        {
+            return found;
+        }
+        final String lowerSearch = search.toLowerCase();
+        int delta = Integer.MAX_VALUE;
+        for (final File file : container)
+        {
+            final String filename = file.getName();
+            final String str = filename.substring(0, filename.length() - 4);
+            if (!str.toLowerCase().startsWith(lowerSearch))
+            {
+                continue;
+            }
+            final int curDelta = str.length() - lowerSearch.length();
+            if (curDelta < delta)
+            {
+                found = str;
+                delta = curDelta;
+            }
+            if (curDelta == 0)
+            {
+                break;
+            }
+            
+        }
+        return found;
+    }
 }

src/lishid/openinv/commands/SearchInvPluginCommand.java

@@ -25,43 +25,52 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class SearchInvPluginCommand implements CommandExecutor {
+public class SearchInvPluginCommand implements CommandExecutor
+{
     private final OpenInv plugin;
-    public SearchInvPluginCommand(OpenInv plugin) {
+    
+    public SearchInvPluginCommand(OpenInv plugin)
+    {
         this.plugin = plugin;
     }
     
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
-
+    {
         if (sender instanceof Player)
         {
-        	if (!sender.hasPermission("OpenInv.search")) {
+            if (!sender.hasPermission("OpenInv.search"))
+            {
                 sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
                 return true;
             }
         }
         
-    	
         String PlayerList = "";
         
         Material material = null;
         int count = 1;
         
-        if (args.length >= 1) {
+        if (args.length >= 1)
+        {
             String[] gData = null;
             gData = args[0].split(":");
             material = Material.matchMaterial(gData[0]);
         }
-        if (args.length >= 2) {
+        if (args.length >= 2)
-            try {
+        {
+            try
+            {
                 count = Integer.parseInt(args[1]);
-            } catch (NumberFormatException ex) {
+            }
+            catch (NumberFormatException ex)
+            {
                 sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!");
                 return false;
             }
         }
         
-		if (material == null) {
+        if (material == null)
+        {
             sender.sendMessage(ChatColor.RED + "Unknown item");
             return false;
         }

src/lishid/openinv/commands/SilentChestPluginCommand.java

@@ -24,18 +24,22 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class SilentChestPluginCommand implements CommandExecutor {
+public class SilentChestPluginCommand implements CommandExecutor
-    public SilentChestPluginCommand(OpenInv plugin) {
+{
+    public SilentChestPluginCommand(OpenInv plugin)
+    {
         
     }
     
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+    {
         if (!(sender instanceof Player))
         {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
             return true;
         }
-    	if (!sender.hasPermission("OpenInv.silent")) {
+        if (!sender.hasPermission("OpenInv.silent"))
+        {
             sender.sendMessage(ChatColor.RED + "You do not have permission to use silent chest.");
             return true;
         }

src/lishid/openinv/commands/ToggleOpenInvPluginCommand.java

@@ -25,15 +25,18 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class ToggleOpenInvPluginCommand implements CommandExecutor {
+public class ToggleOpenInvPluginCommand implements CommandExecutor
+{
     
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+    {
         if (!(sender instanceof Player))
         {
             sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
             return true;
         }
-    	if (!sender.hasPermission("OpenInv.openinv")) {
+        if (!sender.hasPermission("OpenInv.openinv"))
+        {
             sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
             return true;
         }

src/lishid/openinv/utils/Metrics.java

@@ -30,6 +30,7 @@ package lishid.openinv.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 
@@ -49,6 +50,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;
+import java.util.logging.Level;
 
 /**
  * <p>
@@ -63,7 +65,8 @@ import java.util.UUID;
  * void start(); <br/>
  * </code>
  */
-public class Metrics {
+public class Metrics
+{
     
     /**
      * The current revision number
@@ -73,7 +76,7 @@ public class Metrics {
     /**
      * The base url of the metrics domain
      */
-    private static final String BASE_URL = "http://metrics.griefcraft.com";
+    private static final String BASE_URL = "http://mcstats.org";
     
     /**
      * The url used to report a server's status
@@ -94,7 +97,7 @@ public class Metrics {
     /**
      * Interval of time to ping (in minutes)
      */
-    private final static int PING_INTERVAL = 10;
+    private static final int PING_INTERVAL = 10;
     
     /**
      * The plugin this metrics submits for
@@ -116,30 +119,48 @@ public class Metrics {
      */
     private final YamlConfiguration configuration;
     
+    /**
+     * The plugin configuration file
+     */
+    private final File configurationFile;
+    
     /**
      * Unique server id
      */
     private final String guid;
     
-    public Metrics(Plugin plugin) throws IOException {
+    /**
-        if (plugin == null) {
+     * Lock for synchronization
+     */
+    private final Object optOutLock = new Object();
+    
+    /**
+     * Id of the scheduled task
+     */
+    private volatile int taskId = -1;
+    
+    public Metrics(final Plugin plugin) throws IOException
+    {
+        if (plugin == null)
+        {
             throw new IllegalArgumentException("Plugin cannot be null");
         }
         
         this.plugin = plugin;
         
         // load the config
-        File file = new File(CONFIG_FILE);
+        configurationFile = new File(CONFIG_FILE);
-        configuration = YamlConfiguration.loadConfiguration(file);
+        configuration = YamlConfiguration.loadConfiguration(configurationFile);
         
         // add some defaults
         configuration.addDefault("opt-out", false);
         configuration.addDefault("guid", UUID.randomUUID().toString());
         
         // Do we need to create the file?
-        if (configuration.get("guid", null) == null) {
+        if (configuration.get("guid", null) == null)
-            configuration.options().header("http://metrics.griefcraft.com").copyDefaults(true);
+        {
-            configuration.save(file);
+            configuration.options().header("http://mcstats.org").copyDefaults(true);
+            configuration.save(configurationFile);
         }
         
         // Load the guid then
@@ -153,13 +174,15 @@ public class Metrics {
      * @param name
      * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
      */
-    public Graph createGraph(String name) {
+    public Graph createGraph(final String name)
-        if (name == null) {
+    {
+        if (name == null)
+        {
             throw new IllegalArgumentException("Graph name cannot be null");
         }
         
         // Construct the graph object
-        Graph graph = new Graph(name);
+        final Graph graph = new Graph(name);
         
         // Now we can add our graph
         graphs.add(graph);
@@ -168,13 +191,30 @@ public class Metrics {
         return graph;
     }
     
+    /**
+     * Add a Graph object to Metrics that represents data for the plugin that should be sent to the backend
+     * 
+     * @param graph
+     */
+    public void addGraph(final Graph graph)
+    {
+        if (graph == null)
+        {
+            throw new IllegalArgumentException("Graph cannot be null");
+        }
+        
+        graphs.add(graph);
+    }
+    
     /**
      * Adds a custom data plotter to the default graph
      * 
      * @param plotter
      */
-    public void addCustomData(Plotter plotter) {
+    public void addCustomData(final Plotter plotter)
-        if (plotter == null) {
+    {
+        if (plotter == null)
+        {
             throw new IllegalArgumentException("Plotter cannot be null");
         }
         
@@ -189,19 +229,51 @@ public class Metrics {
      * Start measuring statistics. This will immediately create an async repeating task as the plugin and send
      * the initial data to the metrics backend, and then after that it will post in increments of
      * PING_INTERVAL * 1200 ticks.
+     * 
+     * @return True if statistics measuring is running, otherwise false.
      */
-    public void start() {
+    public boolean start()
+    {
+        synchronized (optOutLock)
+        {
             // Did we opt out?
-        if (configuration.getBoolean("opt-out", false)) {
+            if (isOptOut())
-            return;
+            {
+                return false;
+            }
+            
+            // Is metrics already running?
+            if (taskId >= 0)
+            {
+                return true;
             }
             
             // Begin hitting the server with glorious data
-        plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
+            taskId = plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable()
+            {
+                
                 private boolean firstPost = true;
                 
-            public void run() {
+                public void run()
-                try {
+                {
+                    try
+                    {
+                        // This has to be synchronized or it can collide with the disable method.
+                        synchronized (optOutLock)
+                        {
+                            // Disable Task, if it is running and the server owner decided to opt-out
+                            if (isOptOut() && taskId > 0)
+                            {
+                                plugin.getServer().getScheduler().cancelTask(taskId);
+                                taskId = -1;
+                                // Tell all plotters to stop gathering information.
+                                for (Graph graph : graphs)
+                                {
+                                    graph.onOptOut();
+                                }
+                            }
+                        }
+                        
                         // We use the inverse of firstPost because if it is the first time we are posting,
                         // it is not a interval ping, so it evaluates to FALSE
                         // Each time thereafter it will evaluate to TRUE, i.e PING!
@@ -210,108 +282,203 @@ public class Metrics {
                         // After the first post we set firstPost to false
                         // Each post thereafter will be a ping
                         firstPost = false;
-                } catch (Exception e) {
+                    }
-                    System.err.println("[Metrics] " + e.getMessage());
+                    catch (IOException e)
+                    {
+                        Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
                     }
                 }
             }, 0, PING_INTERVAL * 1200);
+            
+            return true;
+        }
+    }
+    
+    /**
+     * Has the server owner denied plugin metrics?
+     * 
+     * @return
+     */
+    public boolean isOptOut()
+    {
+        synchronized (optOutLock)
+        {
+            try
+            {
+                // Reload the metrics file
+                configuration.load(CONFIG_FILE);
+            }
+            catch (IOException ex)
+            {
+                Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                return true;
+            }
+            catch (InvalidConfigurationException ex)
+            {
+                Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                return true;
+            }
+            return configuration.getBoolean("opt-out", false);
+        }
+    }
+    
+    /**
+     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
+     * 
+     * @throws IOException
+     */
+    public void enable() throws IOException
+    {
+        // This has to be synchronized or it can collide with the check in the task.
+        synchronized (optOutLock)
+        {
+            // Check if the server owner has already set opt-out, if not, set it.
+            if (isOptOut())
+            {
+                configuration.set("opt-out", false);
+                configuration.save(configurationFile);
+            }
+            
+            // Enable Task, if it is not running
+            if (taskId < 0)
+            {
+                start();
+            }
+        }
+    }
+    
+    /**
+     * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
+     * 
+     * @throws IOException
+     */
+    public void disable() throws IOException
+    {
+        // This has to be synchronized or it can collide with the check in the task.
+        synchronized (optOutLock)
+        {
+            // Check if the server owner has already set opt-out, if not, set it.
+            if (!isOptOut())
+            {
+                configuration.set("opt-out", true);
+                configuration.save(configurationFile);
+            }
+            
+            // Disable Task, if it is running
+            if (taskId > 0)
+            {
+                this.plugin.getServer().getScheduler().cancelTask(taskId);
+                taskId = -1;
+            }
+        }
     }
     
     /**
      * Generic method that posts a plugin to the metrics website
      */
-    private void postPlugin(boolean isPing) throws IOException {
+    private void postPlugin(final boolean isPing) throws IOException
+    {
         // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        PluginDescriptionFile description = plugin.getDescription();
+        final PluginDescriptionFile description = plugin.getDescription();
         
         // Construct the post data
-        String data = encode("guid") + '=' + encode(guid)
+        final StringBuilder data = new StringBuilder();
-                + encodeDataPair("version", description.getVersion())
+        data.append(encode("guid")).append('=').append(encode(guid));
-                + encodeDataPair("server", Bukkit.getVersion())
+        encodeDataPair(data, "version", description.getVersion());
-                + encodeDataPair("players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length))
+        encodeDataPair(data, "server", Bukkit.getVersion());
-                + encodeDataPair("revision", String.valueOf(REVISION));
+        encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length));
+        encodeDataPair(data, "revision", String.valueOf(REVISION));
         
         // If we're pinging, append it
-        if (isPing) {
+        if (isPing)
-            data += encodeDataPair("ping", "true");
+        {
+            encodeDataPair(data, "ping", "true");
         }
         
         // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
         // inside of the graph (e.g plotters)
-        synchronized (graphs) {
+        synchronized (graphs)
-            Iterator<Graph> iter = graphs.iterator();
+        {
+            final Iterator<Graph> iter = graphs.iterator();
             
-            while (iter.hasNext()) {
+            while (iter.hasNext())
-                Graph graph = iter.next();
+            {
+                final Graph graph = iter.next();
                 
-                // Because we have a lock on the graphs set already, it is reasonable to assume
+                for (Plotter plotter : graph.getPlotters())
-                // that our lock transcends down to the individual plotters in the graphs also.
+                {
-                // Because our methods are private, no one but us can reasonably access this list
-                // without reflection so this is a safe assumption without adding more code.
-                for (Plotter plotter : graph.getPlotters()) {
                     // The key name to send to the metrics server
                     // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
                     // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
-                    String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
+                    final String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
                     
                     // The value to send, which for the foreseeable future is just the string
                     // value of plotter.getValue()
-                    String value = Integer.toString(plotter.getValue());
+                    final String value = Integer.toString(plotter.getValue());
                     
                     // Add it to the http post data :)
-                    data += encodeDataPair(key, value);
+                    encodeDataPair(data, key, value);
                 }
             }
         }
         
         // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, description.getName()));
+        URL url = new URL(BASE_URL + String.format(REPORT_URL, encode(plugin.getDescription().getName())));
         
         // Connect to the website
         URLConnection connection;
         
         // Mineshafter creates a socks proxy, so we can safely bypass it
         // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
+        if (isMineshafterPresent())
+        {
             connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
+        }
+        else
+        {
             connection = url.openConnection();
         }
         
         connection.setDoOutput(true);
         
         // Write the data
-        OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
+        final OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
-        writer.write(data);
+        writer.write(data.toString());
         writer.flush();
         
         // Now read the response
-        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+        final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
+        final String response = reader.readLine();
         
         // close resources
         writer.close();
         reader.close();
         
-        if (response.startsWith("ERR")) {
+        if (response == null || response.startsWith("ERR"))
+        {
             throw new IOException(response); // Throw the exception
-        } else {
+        }
+        else
+        {
             // Is this the first update this hour?
-            if (response.contains("OK This is your first update this hour")) {
+            if (response.contains("OK This is your first update this hour"))
-                synchronized (graphs) {
+            {
-                    Iterator<Graph> iter = graphs.iterator();
+                synchronized (graphs)
+                {
+                    final Iterator<Graph> iter = graphs.iterator();
                     
-                    while (iter.hasNext()) {
+                    while (iter.hasNext())
-                        Graph graph = iter.next();
+                    {
+                        final Graph graph = iter.next();
                         
-                        for (Plotter plotter : graph.getPlotters()) {
+                        for (Plotter plotter : graph.getPlotters())
+                        {
                             plotter.reset();
                         }
                     }
                 }
             }
         }
-        //if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
     }
     
     /**
@@ -319,28 +486,37 @@ public class Metrics {
      * 
      * @return
      */
-    private boolean isMineshafterPresent() {
+    private boolean isMineshafterPresent()
-        try {
+    {
+        try
+        {
             Class.forName("mineshafter.MineServer");
             return true;
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
             return false;
         }
     }
     
     /**
-     * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
+     * <p>
-     * key/value pair MUST be included manually, e.g:</p>
+     * Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first key/value pair MUST be included manually, e.g:
+     * </p>
      * <code>
-     * String httpData = encode("guid") + '=' + encode("1234") + encodeDataPair("authors") + "..";
+     * StringBuffer data = new StringBuffer();
+     * data.append(encode("guid")).append('=').append(encode(guid));
+     * encodeDataPair(data, "version", description.getVersion());
      * </code>
      * 
+     * @param buffer
      * @param key
      * @param value
      * @return
      */
-    private static String encodeDataPair(String key, String value) throws UnsupportedEncodingException {
+    private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException
-        return '&' + encode(key) + '=' + encode(value);
+    {
+        buffer.append('&').append(encode(key)).append('=').append(encode(value));
     }
     
     /**
@@ -349,14 +525,16 @@ public class Metrics {
      * @param text
      * @return
      */
-    private static String encode(String text) throws UnsupportedEncodingException {
+    private static String encode(final String text) throws UnsupportedEncodingException
+    {
         return URLEncoder.encode(text, "UTF-8");
     }
     
     /**
      * Represents a custom graph on the website
      */
-    public static class Graph {
+    public static class Graph
+    {
         
         /**
          * The graph's name, alphanumeric and spaces only :)
@@ -369,7 +547,8 @@ public class Metrics {
          */
         private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
         
-        private Graph(String name) {
+        private Graph(final String name)
+        {
             this.name = name;
         }
         
@@ -378,7 +557,8 @@ public class Metrics {
          * 
          * @return
          */
-        public String getName() {
+        public String getName()
+        {
             return name;
         }
         
@@ -387,7 +567,8 @@ public class Metrics {
          * 
          * @param plotter
          */
-        public void addPlotter(Plotter plotter) {
+        public void addPlotter(final Plotter plotter)
+        {
             plotters.add(plotter);
         }
         
@@ -396,7 +577,8 @@ public class Metrics {
          * 
          * @param plotter
          */
-        public void removePlotter(Plotter plotter) {
+        public void removePlotter(final Plotter plotter)
+        {
             plotters.remove(plotter);
         }
         
@@ -405,31 +587,43 @@ public class Metrics {
          * 
          * @return
          */
-        public Set<Plotter> getPlotters() {
+        public Set<Plotter> getPlotters()
+        {
             return Collections.unmodifiableSet(plotters);
         }
         
         @Override
-        public int hashCode() {
+        public int hashCode()
+        {
             return name.hashCode();
         }
         
         @Override
-        public boolean equals(Object object) {
+        public boolean equals(final Object object)
-            if (!(object instanceof Graph)) {
+        {
+            if (!(object instanceof Graph))
+            {
                 return false;
             }
             
-            Graph graph = (Graph) object;
+            final Graph graph = (Graph) object;
             return graph.name.equals(name);
         }
         
+        /**
+         * Called when the server owner decides to opt-out of Metrics while the server is running.
+         */
+        protected void onOptOut()
+        {
+        }
+        
     }
     
     /**
      * Interface used to collect custom data for a plugin
      */
-    public static abstract class Plotter {
+    public static abstract class Plotter
+    {
         
         /**
          * The plot's name
@@ -439,7 +633,8 @@ public class Metrics {
         /**
          * Construct a plotter with the default plot name
          */
-        public Plotter() {
+        public Plotter()
+        {
             this("Default");
         }
         
@@ -448,7 +643,8 @@ public class Metrics {
          * 
          * @param name
          */
-        public Plotter(String name) {
+        public Plotter(final String name)
+        {
             this.name = name;
         }
         
@@ -464,29 +660,36 @@ public class Metrics {
          * 
          * @return the plotted point's column name
          */
-        public String getColumnName() {
+        public String getColumnName()
+        {
             return name;
         }
         
         /**
          * Called after the website graphs have been updated
          */
-        public void reset() {
+        public void reset()
+        {
         }
         
         @Override
-        public int hashCode() {
+        public int hashCode()
-            return getColumnName().hashCode() + getValue();
+        {
+            return getColumnName().hashCode();
         }
         
         @Override
-        public boolean equals(Object object) {
+        public boolean equals(final Object object)
-            if (!(object instanceof Plotter)) {
+        {
+            if (!(object instanceof Plotter))
+            {
                 return false;
             }
             
-            Plotter plotter = (Plotter) object;
+            final Plotter plotter = (Plotter) object;
             return plotter.name.equals(name) && plotter.getValue() == getValue();
         }
+        
     }
+    
 }

src/lishid/openinv/utils/OpenInvPlayerInventory.java

@@ -16,37 +16,58 @@
 
 package lishid.openinv.utils;
 
-import java.util.ArrayList;
+import lishid.openinv.OpenInv;
-import java.util.List;
 
 import org.bukkit.craftbukkit.entity.CraftHumanEntity;
-import org.bukkit.entity.HumanEntity;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryHolder;
 
-import lishid.openinv.commands.OpenInvPluginCommand;
 import net.minecraft.server.EntityHuman;
-import net.minecraft.server.EntityPlayer;
-import net.minecraft.server.IInventory;
 import net.minecraft.server.ItemStack;
 import net.minecraft.server.PlayerInventory;
 
-public class PlayerInventoryChest implements IInventory
+public class OpenInvPlayerInventory extends PlayerInventory
 {
-    public boolean Offline = false;
+    CraftPlayer owner;
-    public Player Opener;
+    public boolean playerOnline = false;
-    EntityPlayer player;
-    public Player Target;
-    private ItemStack[] items = new ItemStack[36];
-    private ItemStack[] armor = new ItemStack[4];
     private ItemStack[] extra = new ItemStack[5];
-    private int maxStack = MAX_STACK;
     
-    public PlayerInventoryChest(PlayerInventory inventory, EntityPlayer entityplayer)
+    public OpenInvPlayerInventory(CraftPlayer p, boolean online)
     {
-        player = entityplayer;
+        super(p.getHandle());
-        this.items = inventory.items;
+        this.owner = p;
-        this.armor = inventory.armor;
+        this.items = player.inventory.items;
+        this.armor = player.inventory.armor;
+    }
+    
+    public void onClose(CraftHumanEntity who)
+    {
+        super.onClose(who);
+        this.InventoryRemovalCheck();
+    }
+    
+    public void InventoryRemovalCheck()
+    {
+        if (transaction.isEmpty() && !playerOnline)
+        {
+            owner.saveData();
+            OpenInv.inventories.remove(owner.getName().toLowerCase());
+        }
+    }
+    
+    public void PlayerGoOnline(CraftPlayer p)
+    {
+        if(!playerOnline)
+        {
+            p.getHandle().inventory.items = this.items;
+            p.getHandle().inventory.armor = this.armor;
+            p.saveData();
+            playerOnline = true;
+        }
+    }
+    
+    public void PlayerGoOffline()
+    {
+        playerOnline = false;
     }
     
     public ItemStack[] getContents()
@@ -59,7 +80,7 @@ public class PlayerInventoryChest implements IInventory
     
     public int getSize()
     {
-        return 45;
+        return super.getSize() + 5;
     }
     
     public ItemStack getItem(int i)
@@ -140,7 +161,8 @@ public class PlayerInventoryChest implements IInventory
         }
     }
     
-    public ItemStack splitWithoutUpdate(int i) {
+    public ItemStack splitWithoutUpdate(int i)
+    {
         ItemStack[] is = this.items;
         
         if (i >= is.length)
@@ -163,12 +185,15 @@ public class PlayerInventoryChest implements IInventory
             i = getReversedArmorSlotNum(i);
         }
         
-        if (is[i] != null) {
+        if (is[i] != null)
+        {
             ItemStack itemstack = is[i];
             
             is[i] = null;
             return itemstack;
-        } else {
+        }
+        else
+        {
             return null;
         }
     }
@@ -198,96 +223,53 @@ public class PlayerInventoryChest implements IInventory
         }
         
         /*
-        
+         * 
-        //Effects
+         * //Effects
-        if(is == this.extra)
+         * if(is == this.extra)
-        {
+         * {
-        	if(i == 0)
+         * if(i == 0)
-        	{
+         * {
-        		itemstack.setData(0);
+         * itemstack.setData(0);
-        	}
+         * }
-        }*/
+         * }
+         */
         
         is[i] = itemstack;
     }
     
     private int getReversedItemSlotNum(int i)
     {
-        if (i >= 27) return i - 27;
+        if (i >= 27)
-        else return i + 9;
+            return i - 27;
+        else
+            return i + 9;
     }
     
     private int getReversedArmorSlotNum(int i)
     {
-        if (i == 0) return 3;
+        if (i == 0)
-        if (i == 1) return 2;
+            return 3;
-        if (i == 2) return 1;
+        if (i == 1)
-        if (i == 3) return 0;
+            return 2;
-        else return i;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
     }
     
     public String getName()
     {
-        if (player.name.length() > 16) return player.name.substring(0, 16);
+        if (player.name.length() > 16)
-        return player.name;
-    }
-
-    public int getMaxStackSize()
         {
-        return maxStack;
+            return player.name.substring(0, 16);
+        }
+        return player.name;
     }
     
     public boolean a(EntityHuman entityhuman)
     {
         return true;
     }
-
-    public void f()
-    {
-
-    }
-
-    public void g()
-    {
-        try
-        {
-            PlayerInventoryChest inv = OpenInvPluginCommand.offlineInv.get(this.Target);
-            if (inv != null)
-            {
-                this.Target.saveData();
-                OpenInvPluginCommand.offlineInv.remove(this.Target);
-            }
-        }
-        catch (Exception e)
-        {}
-    }
-
-    public void update()
-    {
-
-    }
-    
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-    }
-
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-	@Override
-	public InventoryHolder getOwner() {
-		return null;
-	}
-
-	@Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
 }

src/lishid/openinv/utils/SilentContainerChest.java

@@ -20,17 +20,23 @@ import net.minecraft.server.ContainerChest;
 import net.minecraft.server.EntityHuman;
 import net.minecraft.server.IInventory;
 
-public class SilentContainerChest extends ContainerChest {
+public class SilentContainerChest extends ContainerChest
+{
     public IInventory inv;
-    public SilentContainerChest(IInventory i1, IInventory i2) {
+    
+    public SilentContainerChest(IInventory i1, IInventory i2)
+    {
         super(i1, i2);
         inv = i2;
-    	inv.g();//close signal
+        // close signal
+        inv.g();
     }
     
     @Override
-    public void a(EntityHuman paramEntityHuman) {
+    public void a(EntityHuman paramEntityHuman)
+    {
         super.a(paramEntityHuman);
-        inv.f();//open signal
+        // open signal
+        inv.f();
     }
 }

src/plugin.yml

@@ -1,6 +1,6 @@
 name: OpenInv
 main: lishid.openinv.OpenInv
-version: 1.8.4
+version: 1.8.5
 author: lishid
 website: http://forums.bukkit.org/threads/15379/
 description: >