Fix improper caching causing duplications, closes #10

* Implemented a universal cache for loaded players
* Reworked a significant amount of my API additions
* Simplified join/quit handling
* Cleaned up ISpecialEnderChest/ISpecialPlayerInventory implementations
* Fixed OpenInv.* permission not granting access to commands

README.MD

@@ -4,9 +4,10 @@ This fork of OpenInv was created when the lag caused by offline player lookups p
 ### Changes of Note
 - Removed updater
 - Removed wand
+- New configuration option `DisableSaving`: Inventory edits will not be saved unless the user is online.
 
 ## Previous Versions
-Any version of Minecraft this fork has been existent for should have a [release](https://github.com/Jikoo/OpenInv/releases) tagged. Features are not backported, however.
+This fork supports any version after 1.4.5. Binaries are available in the [releases tab](https://github.com/Jikoo/OpenInv/releases). Please allow a brief period after the release of a new version for updates.
 
 ## License
 ```

pom.xml

@@ -5,6 +5,20 @@
   <version>0.0.1-SNAPSHOT</version>
 
   <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.10-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_10_R1</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.9.4-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+      <classifier>v1_9_R2</classifier>
+    </dependency>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>

src/main/java/com/lishid/openinv/OpenInv.java

@@ -18,14 +18,9 @@ package com.lishid.openinv;
 
 import java.util.HashMap;
 import java.util.Map;
-
-import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import com.lishid.openinv.commands.AnyChestPluginCommand;
 import com.lishid.openinv.commands.OpenEnderPluginCommand;
@@ -38,6 +33,20 @@ import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.internal.InternalAccessor;
+import com.lishid.openinv.util.Cache;
+import com.lishid.openinv.util.Function;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitRunnable;
 
 /**
  * Open other player's inventory
@@ -48,6 +57,42 @@ public class OpenInv extends JavaPlugin {
 
     private final Map<String, ISpecialPlayerInventory> inventories = new HashMap<String, ISpecialPlayerInventory>();
     private final Map<String, ISpecialEnderChest> enderChests = new HashMap<String, ISpecialEnderChest>();
+    private final Cache<String, Player> playerCache = new Cache<String, Player>(300000L,
+            new Function<Player>() {
+                @Override
+                public boolean run(Player value) {
+                    String key = playerLoader.getPlayerDataID(value);
+                    return inventories.containsKey(key) && inventories.get(key).isInUse()
+                            || enderChests.containsKey(key) && enderChests.get(key).isInUse();
+                }
+            },
+            new Function<Player>() {
+                @Override
+                public boolean run(Player value) {
+                    String key = playerLoader.getPlayerDataID(value);
+
+                    // Check if inventory is stored, and if it is, remove it and eject all viewers
+                    if (inventories.containsKey(key)) {
+                        Inventory inv = inventories.remove(key).getBukkitInventory();
+                        for (HumanEntity entity : inv.getViewers()) {
+                            entity.closeInventory();
+                        }
+                    }
+
+                    // Check if ender chest is stored, and if it is, remove it and eject all viewers
+                    if (enderChests.containsKey(key)) {
+                        Inventory inv = enderChests.remove(key).getBukkitInventory();
+                        for (HumanEntity entity : inv.getViewers()) {
+                            entity.closeInventory();
+                        }
+                    }
+
+                    if (!OpenInv.this.disableSaving() && !value.isOnline()) {
+                        value.saveData();
+                    }
+                    return true;
+                }
+            });
 
     private InternalAccessor accessor;
     private IPlayerDataManager playerLoader;
@@ -73,12 +118,26 @@ public class OpenInv extends JavaPlugin {
         anySilentChest = accessor.newAnySilentChest();
 
         FileConfiguration config = getConfig();
-        config.set("NotifySilentChest", config.getBoolean("NotifySilentChest", true));
-        config.set("NotifyAnyChest", config.getBoolean("NotifyAnyChest", true));
+        boolean dirtyConfig = false;
+        if (!config.isBoolean("NotifySilentChest")) {
+            config.set("NotifySilentChest", true);
+            dirtyConfig = true;
+        }
+        if (!config.isBoolean("NotifyAnyChest")) {
+            config.set("NotifyAnyChest", true);
+            dirtyConfig = true;
+        }
+        if (!config.isBoolean("DisableSaving")) {
+            config.set("DisableSaving", false);
+            dirtyConfig = true;
+        }
         config.addDefault("NotifySilentChest", true);
         config.addDefault("NotifyAnyChest", true);
+        config.addDefault("DisableSaving", false);
         config.options().copyDefaults(true);
-        saveConfig();
+        if (dirtyConfig) {
+            saveConfig();
+        }
 
         pm.registerEvents(new OpenInvPlayerListener(this), this);
         pm.registerEvents(new OpenInvInventoryListener(this), this);
@@ -91,12 +150,14 @@ public class OpenInv extends JavaPlugin {
 
     }
 
-    public InternalAccessor getInternalAccessor() {
-        return this.accessor;
-    }
+    @Override
+    public void onDisable() {
 
-    public IPlayerDataManager getPlayerLoader() {
-        return this.playerLoader;
+        if (this.disableSaving()) {
+            return;
+        }
+
+        this.playerCache.invalidateAll();
     }
 
     public IInventoryAccess getInventoryAccess() {
@@ -107,54 +168,39 @@ public class OpenInv extends JavaPlugin {
         return this.anySilentChest;
     }
 
-    public ISpecialPlayerInventory getInventoryFor(Player player) {
-        String id = getPlayerLoader().getPlayerDataID(player);
+    public ISpecialPlayerInventory getInventoryFor(Player player, boolean online) {
+        String id = playerLoader.getPlayerDataID(player);
         if (inventories.containsKey(id)) {
             return inventories.get(id);
         }
-        return null;
-    }
-
-    public ISpecialPlayerInventory getOrCreateInventoryFor(Player player, boolean offline) {
-        String id = getPlayerLoader().getPlayerDataID(player);
-        if (inventories.containsKey(id)) {
-            return inventories.get(id);
-        }
-        ISpecialPlayerInventory inv = getInternalAccessor().newSpecialPlayerInventory(player, offline);
+        ISpecialPlayerInventory inv = accessor.newSpecialPlayerInventory(player, online);
         inventories.put(id, inv);
+        playerCache.put(id, player);
         return inv;
     }
 
-    public void removeLoadedInventory(Player player) {
-        String id = getPlayerLoader().getPlayerDataID(player);
-        if (inventories.containsKey(id)) {
-            inventories.remove(id);
-        }
-    }
-
-    public ISpecialEnderChest getEnderChestFor(Player player) {
-        String id = getPlayerLoader().getPlayerDataID(player);
+    public ISpecialEnderChest getEnderChestFor(Player player, boolean online) {
+        String id = playerLoader.getPlayerDataID(player);
         if (enderChests.containsKey(id)) {
             return enderChests.get(id);
         }
-        return null;
-    }
-
-    public ISpecialEnderChest getOrCreateEnderChestFor(Player player, boolean offline) {
-        String id = getPlayerLoader().getPlayerDataID(player);
-        if (enderChests.containsKey(id)) {
-            return enderChests.get(id);
-        }
-        ISpecialEnderChest inv = getInternalAccessor().newSpecialEnderChest(player, offline);
+        ISpecialEnderChest inv = accessor.newSpecialEnderChest(player, online);
         enderChests.put(id, inv);
+        playerCache.put(id, player);
         return inv;
     }
 
-    public void removeLoadedEnderChest(Player player) {
-        String id = getPlayerLoader().getPlayerDataID(player);
-        if (enderChests.containsKey(id)) {
-            enderChests.remove(id);
-        }
+    /**
+     * Unload a cached Player's data.
+     * 
+     * @param player the OfflinePlayer to unload
+     */
+    public void unload(OfflinePlayer player) {
+        this.playerCache.invalidate(this.playerLoader.getPlayerDataID(player));
+    }
+
+    public boolean disableSaving() {
+        return getConfig().getBoolean("DisableSaving", false);
     }
 
     public boolean notifySilentChest() {
@@ -166,24 +212,221 @@ public class OpenInv extends JavaPlugin {
     }
 
     public boolean getPlayerSilentChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("SilentChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", false);
+        return getConfig().getBoolean("SilentChest." + playerLoader.getPlayerDataID(player) + ".toggle", false);
     }
 
     public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("SilentChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", status);
+        getConfig().set("SilentChest." + playerLoader.getPlayerDataID(player) + ".toggle", status);
         saveConfig();
     }
 
     public boolean getPlayerAnyChestStatus(OfflinePlayer player) {
-        return getConfig().getBoolean("AnyChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", true);
+        return getConfig().getBoolean("AnyChest." + playerLoader.getPlayerDataID(player) + ".toggle", true);
     }
 
     public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status) {
-        getConfig().set("AnyChest." + getPlayerLoader().getPlayerDataID(player) + ".toggle", status);
+        getConfig().set("AnyChest." + playerLoader.getPlayerDataID(player) + ".toggle", status);
         saveConfig();
     }
 
+    /**
+     * Get an OfflinePlayer by name.
+     * 
+     * @param name the name of the Player
+     * @return the OfflinePlayer, or null if no players have ever logged in
+     */
+    public OfflinePlayer matchPlayer(String name) {
+
+        // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds.
+        if (getServer().isPrimaryThread()) {
+            getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!");
+            getLogger().warning("This can cause the server to hang, potentially severely.");
+            getLogger().warning("Trace:");
+            for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) {
+                getLogger().warning(element.toString());
+            }
+        }
+
+        // Ensure name is valid if server is in online mode to avoid unnecessary searching
+        if (getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) {
+            return null;
+        }
+
+        OfflinePlayer player = getServer().getPlayerExact(name);
+
+        if (player != null) {
+            return player;
+        }
+
+        player = getServer().getOfflinePlayer(name);
+
+        /*
+         * Compatibility: Pre-UUID, getOfflinePlayer always returns an OfflinePlayer. Post-UUID,
+         * getOfflinePlayer will return null if no matching player is found. To preserve
+         * compatibility, only return the player if they have played before. Ignoring current online
+         * status is fine, they'd have been found by getPlayerExact otherwise.
+         */
+        if (player != null && player.hasPlayedBefore()) {
+            return player;
+        }
+
+        player = getServer().getPlayer(name);
+
+        if (player != null) {
+            return player;
+        }
+
+        int bestMatch = Integer.MAX_VALUE;
+        for (OfflinePlayer offline : getServer().getOfflinePlayers()) {
+            if (offline.getName() == null) {
+                // Loaded by UUID only, name has never been looked up.
+                continue;
+            }
+
+            // Compatibility: Lang3 is only bundled with 1.8+
+            int currentMatch = org.apache.commons.lang.StringUtils.getLevenshteinDistance(name, offline.getName());
+
+            if (currentMatch == 0) {
+                return offline;
+            }
+
+            if (currentMatch < bestMatch) {
+                bestMatch = currentMatch;
+                player = offline;
+            }
+        }
+
+        // Only null if no players have played ever, otherwise even the worst match will do.
+        return player;
+    }
+
+    /**
+     * Load a Player from an OfflinePlayer.
+     * 
+     * @param offline the OfflinePlayer to load a Player for
+     * @return the Player
+     */
+    public Player loadPlayer(final OfflinePlayer offline) {
+
+        if (offline == null) {
+            return null;
+        }
+
+        String key = this.playerLoader.getPlayerDataID(offline);
+        if (this.playerCache.containsKey(key)) {
+            return this.playerCache.get(key);
+        }
+
+        Player loaded;
+
+        if (offline.isOnline()) {
+            loaded = offline.getPlayer();
+            this.playerCache.put(key, loaded);
+            return loaded;
+        }
+
+        if (Bukkit.isPrimaryThread()) {
+            return this.playerLoader.loadPlayer(offline);
+        }
+
+        Future<Player> future = Bukkit.getScheduler().callSyncMethod(this,
+                new Callable<Player>() {
+                    @Override
+                    public Player call() throws Exception {
+                        return playerLoader.loadPlayer(offline);
+                    }
+                });
+
+        int ticks = 0;
+        while (!future.isDone() && !future.isCancelled() && ticks < 10) {
+            ++ticks;
+            try {
+                Thread.sleep(50L);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+
+        if (!future.isDone() || future.isCancelled()) {
+            return null;
+        }
+
+        try {
+            loaded = future.get();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            return null;
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        if (loaded != null) {
+            this.playerCache.put(key, loaded);
+        }
+
+        return loaded;
+    }
+
+    /**
+     * Method for handling a Player coming online.
+     * 
+     * @param player
+     */
+    public void setPlayerOnline(final Player player) {
+
+        String key = this.playerLoader.getPlayerDataID(player);
+
+        // Check if the player is cached. If not, neither of their inventories is open.
+        if (!this.playerCache.containsKey(key)) {
+            return;
+        }
+
+        this.playerCache.put(key, player);
+
+        if (this.inventories.containsKey(key)) {
+            this.inventories.get(key).setPlayerOnline(player);
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    if (player.isOnline()) {
+                        player.updateInventory();
+                    }
+                }
+            }.runTask(this);
+        }
+
+        if (this.enderChests.containsKey(key)) {
+            this.enderChests.get(key).setPlayerOnline(player);
+        }
+    }
+
+    /**
+     * Method for handling a Player going offline.
+     * 
+     * @param player
+     */
+    public void setPlayerOffline(final Player player) {
+
+        String key = this.playerLoader.getPlayerDataID(player);
+
+        // Check if the player is cached. If not, neither of their inventories is open.
+        if (!this.playerCache.containsKey(key)) {
+            return;
+        }
+
+        if (this.inventories.containsKey(key)) {
+            this.inventories.get(key).setPlayerOffline();
+        }
+
+        if (this.enderChests.containsKey(key)) {
+            this.enderChests.get(key).setPlayerOffline();
+        }
+    }
+
     public static void ShowHelp(Player player) {
+        // TODO: Do not show commands players lack permissions for
         player.sendMessage(ChatColor.GREEN + "/openinv <Player> - Open a player's inventory");
         player.sendMessage(ChatColor.GREEN + "   (aliases: oi, inv, open)");
         player.sendMessage(ChatColor.GREEN + "/openender <Player> - Open a player's enderchest");
@@ -208,4 +451,5 @@ public class OpenInv extends JavaPlugin {
         }
         return player.hasPermission(permission);
     }
+
 }

src/main/java/com/lishid/openinv/OpenInvInventoryListener.java

@@ -32,13 +32,9 @@ public class OpenInvInventoryListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onInventoryClick(InventoryClickEvent event) {
-        // If this is the top inventory
-        // if (event.getView().convertSlot(event.getRawSlot()) == event.getRawSlot())
-        // {
         if (!plugin.getInventoryAccess().check(event.getInventory(), event.getWhoClicked())) {
             event.setCancelled(true);
         }
-        // }
     }
 
     @EventHandler(priority = EventPriority.NORMAL)

src/main/java/com/lishid/openinv/OpenInvPlayerListener.java

@@ -27,10 +27,6 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
 
 public class OpenInvPlayerListener implements Listener {
 
@@ -42,39 +38,12 @@ public class OpenInvPlayerListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(final PlayerJoinEvent event) {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                if (!event.getPlayer().isOnline()) {
-                    return;
-                }
-                ISpecialPlayerInventory inventory = plugin.getInventoryFor(event.getPlayer());
-                if (inventory != null) {
-                    inventory.setPlayerOnline(event.getPlayer());
-                    event.getPlayer().updateInventory();
-                }
-                ISpecialEnderChest chest = plugin.getEnderChestFor(event.getPlayer());
-                if (chest != null) {
-                    chest.setPlayerOnline(event.getPlayer());
-                }
-            }
-        }.runTask(plugin);
+        plugin.setPlayerOnline(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(PlayerQuitEvent event) {
-        ISpecialPlayerInventory inventory = plugin.getInventoryFor(event.getPlayer());
-        if (inventory != null) {
-            if (inventory.setPlayerOffline()) {
-                plugin.removeLoadedInventory(event.getPlayer());
-            }
-        }
-        ISpecialEnderChest chest = plugin.getEnderChestFor(event.getPlayer());
-        if (chest != null) {
-            if (chest.setPlayerOffline()) {
-                plugin.removeLoadedEnderChest(event.getPlayer());
-            }
-        }
+        plugin.setPlayerOffline(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR)

src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java

@@ -17,9 +17,11 @@
 package com.lishid.openinv.commands;
 
 import java.util.HashMap;
-import java.util.List;
 
-import org.bukkit.Bukkit;
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -28,10 +30,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 public class OpenEnderPluginCommand implements CommandExecutor {
     private final OpenInv plugin;
     public static HashMap<Player, String> openEnderHistory = new HashMap<Player, String>();
@@ -75,20 +73,13 @@ public class OpenEnderPluginCommand implements CommandExecutor {
         new BukkitRunnable() {
             @Override
             public void run() {
-                List<Player> matches = Bukkit.matchPlayer(name);
-                final OfflinePlayer offlinePlayer;
-                if (!matches.isEmpty()) {
-                    offlinePlayer = matches.get(0);
-                } else {
-                    offlinePlayer = Bukkit.getOfflinePlayer(name);
-                }
-                if (!player.isOnline()) {
-                    return;
-                }
+                final OfflinePlayer offlinePlayer = plugin.matchPlayer(name);
+
                 if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                     player.sendMessage(ChatColor.RED + "Player not found!");
                     return;
                 }
+
                 new BukkitRunnable() {
                     @Override
                     public void run() {
@@ -98,6 +89,7 @@ public class OpenEnderPluginCommand implements CommandExecutor {
                         openInventory(player, offlinePlayer);
                     }
                 }.runTask(plugin);
+
             }
         }.runTaskAsynchronously(plugin);
 
@@ -107,9 +99,11 @@ public class OpenEnderPluginCommand implements CommandExecutor {
     private void openInventory(Player player, OfflinePlayer target) {
 
         Player onlineTarget;
-        if (!target.isOnline()) {
+        boolean online = target.isOnline();
+
+        if (!online) {
             // Try loading the player's data
-            onlineTarget = plugin.getPlayerLoader().loadPlayer(target);
+            onlineTarget = plugin.loadPlayer(target);
 
             if (onlineTarget == null) {
                 player.sendMessage(ChatColor.RED + "Player not found!");
@@ -129,7 +123,7 @@ public class OpenEnderPluginCommand implements CommandExecutor {
         openEnderHistory.put(player, onlineTarget.getName());
 
         // Create the inventory
-        ISpecialEnderChest chest = plugin.getOrCreateEnderChestFor(onlineTarget, !target.isOnline());
+        ISpecialEnderChest chest = plugin.getEnderChestFor(onlineTarget, online);
 
         // Open the inventory
         player.openInventory(chest.getBukkitInventory());

src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java

@@ -17,9 +17,11 @@
 package com.lishid.openinv.commands;
 
 import java.util.HashMap;
-import java.util.List;
 
-import org.bukkit.Bukkit;
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -28,10 +30,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import com.lishid.openinv.OpenInv;
-import com.lishid.openinv.Permissions;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 public class OpenInvPluginCommand implements CommandExecutor {
     private final OpenInv plugin;
     public static HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
@@ -75,20 +73,13 @@ public class OpenInvPluginCommand implements CommandExecutor {
         new BukkitRunnable() {
             @Override
             public void run() {
-                List<Player> matches = Bukkit.matchPlayer(name);
-                final OfflinePlayer offlinePlayer;
-                if (!matches.isEmpty()) {
-                    offlinePlayer = matches.get(0);
-                } else {
-                    offlinePlayer = Bukkit.getOfflinePlayer(name);
-                }
-                if (!player.isOnline()) {
-                    return;
-                }
+                final OfflinePlayer offlinePlayer = plugin.matchPlayer(name);
+
                 if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                     player.sendMessage(ChatColor.RED + "Player not found!");
                     return;
                 }
+
                 new BukkitRunnable() {
                     @Override
                     public void run() {
@@ -98,6 +89,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
                         openInventory(player, offlinePlayer);
                     }
                 }.runTask(plugin);
+
             }
         }.runTaskAsynchronously(plugin);
 
@@ -108,10 +100,11 @@ public class OpenInvPluginCommand implements CommandExecutor {
 
 
         Player onlineTarget;
+        boolean online = target.isOnline();
 
-        if (!target.isOnline()) {
+        if (!online) {
             // Try loading the player's data
-            onlineTarget = plugin.getPlayerLoader().loadPlayer(target);
+            onlineTarget = plugin.loadPlayer(target);
 
             if (onlineTarget == null) {
                 player.sendMessage(ChatColor.RED + "Player not found!");
@@ -143,7 +136,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
         openInvHistory.put(player, onlineTarget.getName());
 
         // Create the inventory
-        ISpecialPlayerInventory inv = plugin.getOrCreateInventoryFor(onlineTarget, !target.isOnline());
+        ISpecialPlayerInventory inv = plugin.getInventoryFor(onlineTarget, online);
 
         // Open the inventory
         player.openInventory(inv.getBukkitInventory());

src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java

@@ -19,15 +19,24 @@ package com.lishid.openinv.internal;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-public abstract class IPlayerDataManager {
-    public final Player loadPlayer(OfflinePlayer offline) {
-        if (offline.isOnline()) {
-            return offline.getPlayer();
-        }
-        return this.loadOfflinePlayer(offline);
-    }
+public interface IPlayerDataManager {
 
-    protected abstract Player loadOfflinePlayer(OfflinePlayer offline);
+    /**
+     * Loads a Player for an OfflinePlayer.
+     * </p>
+     * This method is potentially blocking, and should not be called on the main thread.
+     * 
+     * @param offline
+     * @return
+     */
+    public Player loadPlayer(OfflinePlayer offline);
+
+    /**
+     * Gets a unique identifying string for an OfflinePlayer.
+     * 
+     * @param player
+     * @return
+     */
+    public String getPlayerDataID(OfflinePlayer player);
 
-    public abstract String getPlayerDataID(OfflinePlayer player);
 }

src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java

@@ -23,15 +23,23 @@ public interface ISpecialEnderChest {
 
     public Inventory getBukkitInventory();
 
-    public boolean inventoryRemovalCheck(boolean save);
-
+    /**
+     * Sets the Player associated with this ISpecialEnderChest online.
+     * 
+     * @param player the Player coming online
+     */
     public void setPlayerOnline(Player player);
 
     /**
      * Sets the Player associated with this ISpecialEnderChest offline.
-     * 
-     * @return true if the ISpecialEnderChest is eligible for removal
      */
-    public boolean setPlayerOffline();
+    public void setPlayerOffline();
+
+    /**
+     * Gets whether or not this ISpecialEnderChest is in use.
+     * 
+     * @return true if the ISpecialEnderChest is in use
+     */
+    public boolean isInUse();
 
 }

src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java

@@ -23,14 +23,23 @@ public interface ISpecialPlayerInventory {
 
     public Inventory getBukkitInventory();
 
-    public boolean inventoryRemovalCheck(boolean save);
-
+    /**
+     * Sets the Player associated with this ISpecialPlayerInventory online.
+     * 
+     * @param player the Player coming online
+     */
     public void setPlayerOnline(Player player);
 
     /**
      * Sets the Player associated with this ISpecialPlayerInventory offline.
-     * 
-     * @return true if the ISpecialPlayerInventory is eligible for removal
      */
-    public boolean setPlayerOffline();
+    public void setPlayerOffline();
+
+    /**
+     * Gets whether or not this ISpecialPlayerInventory is in use.
+     * 
+     * @return true if the ISpecialPlayerInventory is in use
+     */
+    public boolean isInUse();
+
 }

src/main/java/com/lishid/openinv/internal/InternalAccessor.java

@@ -16,11 +16,11 @@
 
 package com.lishid.openinv.internal;
 
+import com.lishid.openinv.OpenInv;
+
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.OpenInv;
-
 public class InternalAccessor {
 
     private final OpenInv plugin;
@@ -71,7 +71,9 @@ public class InternalAccessor {
         try {
             Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialPlayerInventory");
             if (ISpecialPlayerInventory.class.isAssignableFrom(internalClass)) {
-                return (ISpecialPlayerInventory) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
+                return (ISpecialPlayerInventory) internalClass
+                        .getConstructor(Player.class, Boolean.class)
+                        .newInstance(player, offline);
             }
         }
         catch (Exception e) {
@@ -86,7 +88,9 @@ public class InternalAccessor {
         try {
             Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialEnderChest");
             if (ISpecialEnderChest.class.isAssignableFrom(internalClass)) {
-                return (ISpecialEnderChest) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
+                return (ISpecialEnderChest) internalClass
+                        .getConstructor(Player.class, Boolean.class)
+                        .newInstance(player, offline);
             }
         }
         catch (Exception e) {

src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentChest.java

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
+import net.minecraft.server.v1_10_R1.Block;
+import net.minecraft.server.v1_10_R1.BlockPosition;
+import net.minecraft.server.v1_10_R1.Entity;
+import net.minecraft.server.v1_10_R1.EntityOcelot;
+import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.ITileInventory;
+import net.minecraft.server.v1_10_R1.InventoryLargeChest;
+import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_10_R1.TileEntityChest;
+import net.minecraft.server.v1_10_R1.World;
+
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block or ocelot on top
+        if (world.getType(new BlockPosition(x, y + 1, z)).l() || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (isBlockedChest(world, id, x - 1, y, z))
+            return true;
+        if (isBlockedChest(world, id, x + 1, y, z))
+            return true;
+        if (isBlockedChest(world, id, x, y, z - 1))
+            return true;
+        if (isBlockedChest(world, id, x, y, z + 1))
+            return true;
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        BlockPosition position = new BlockPosition(x, y, z);
+        if (Block.getId(world.getType(position).getBlock()) != id) {
+            return false;
+        }
+
+        if (world.getType(position).l()) {
+            return true;
+        }
+
+        return hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(new BlockPosition(x, y, z));
+        if (chest == null)
+            return true;
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        if (!anychest) {
+            if (world.getType(new BlockPosition(x, y + 1, z)).l())
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x - 1, y + 1, z)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x + 1, y + 1, z)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x, y, z - 1)).getBlock()) == id) && (world.getType(new BlockPosition(x, y + 1, z - 1)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x, y, z + 1)).getBlock()) == id) && (world.getType(new BlockPosition(x, y + 1, z + 1)).l()))
+                return true;
+        }
+
+        if (Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x - 1, y, z)), (ITileInventory) chest);
+        if (Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x + 1, y, z)));
+        if (Block.getId(world.getType(new BlockPosition(x, y, z - 1)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z - 1)), (ITileInventory) chest);
+        if (Block.getId(world.getType(new BlockPosition(x, y, z + 1)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z + 1)));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) chest), player);
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) chest).getScoreboardDisplayName(), ((IInventory) chest).getSize()));
+                player.activeContainer = silentContainerChest;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import java.lang.reflect.Field;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.IInventory;
+
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = grabInventory(inventory);
+        
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+    
+    private IInventory grabInventory(Inventory inventory) {
+        if(inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory();
+        }
+        
+        //Use reflection to find the iinventory
+        Class<? extends Inventory> clazz = inventory.getClass();
+        IInventory result = null;
+        for(Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if(IInventory.class.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = (IInventory) f.get(inventory);
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.MinecraftServer;
+import net.minecraft.server.v1_10_R1.PlayerInteractManager;
+
+import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    @Override
+    public Player loadPlayer(OfflinePlayer offline) {
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Create an entity to load the player data
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+
+        // Get the bukkit entity
+        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+            // Return the entity
+            return target;
+        }
+        return null;
+    }
+
+    @Override
+    public String getPlayerDataID(OfflinePlayer player) {
+        return player.getUniqueId().toString();
+    }
+
+}

src/main/java/com/lishid/openinv/internal/v1_10_R1/SilentContainerChest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.ContainerChest;
+import net.minecraft.server.v1_10_R1.EntityHuman;
+import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.PlayerInventory;
+
+public class SilentContainerChest extends ContainerChest {
+    public IInventory inv;
+
+    public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
+        super(i1, i2, e1);
+        inv = i2;
+        // close signal
+        inv.closeContainer(e1);
+    }
+
+    @Override
+    public void b(EntityHuman entityHuman) {
+        // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.IInventory;
+import net.minecraft.server.v1_10_R1.InventoryEnderChest;
+import net.minecraft.server.v1_10_R1.InventorySubcontainer;
+import net.minecraft.server.v1_10_R1.ItemStack;
+
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
+
+public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
+        setItemArrays(this, enderChest.getContents());
+    }
+
+    private void setItemArrays(InventorySubcontainer subcontainer, ItemStack[] items) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+            // Access and replace main inventory array
+            Field field = InventorySubcontainer.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(subcontainer, items);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            try {
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                setItemArrays(craftPlayer.getHandle().getEnderChest(), this.items);
+            }
+            catch (Exception e) {}
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        enderChest.update();
+    }
+
+}

src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java

@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_10_R1;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_10_R1.EntityHuman;
+import net.minecraft.server.v1_10_R1.ItemStack;
+import net.minecraft.server.v1_10_R1.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[4];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
+    }
+
+    private void setItemArrays(PlayerInventory inventory, ItemStack[] items, ItemStack[] armor,
+            ItemStack[] extraSlots) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+
+            // Access and replace main inventory array
+            Field field = PlayerInventory.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, items);
+
+            // Access and replace armor inventory array
+            field = PlayerInventory.class.getField("armor");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, armor);
+
+            // Access and replace offhand inventory array
+            field = PlayerInventory.class.getField("extraSlots");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, extraSlots);
+
+            // Access and replace array containing all inventory arrays
+            field = PlayerInventory.class.getDeclaredField("g");
+            field.setAccessible(true);
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, new ItemStack[][] { items, armor, extraSlots });
+        } catch (NoSuchFieldException e) {
+            // Unable to set final fields to item arrays, we're screwed. Noisily fail.
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            setItemArrays(this.player.inventory, items, armor, extraSlots);
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
+        return contents;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        // extraSlots is, for now, just an array with length 1. No need for special handling.
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].cloneAndSubtract(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack, true);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+    @Override
+    public boolean a(EntityHuman entityhuman) {
+        return true;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_4_5.EntityPlayer;
 import net.minecraft.server.v1_4_5.ItemInWorldManager;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_4_5.MinecraftServer;
 
 import org.bukkit.craftbukkit.v1_4_5.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_5;
 import net.minecraft.server.v1_4_5.ContainerChest;
 import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;
+import net.minecraft.server.v1_4_5.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.IInventory;
 import net.minecraft.server.v1_4_5.InventoryEnderChest;
 import net.minecraft.server.v1_4_5.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_5;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_4_5.EntityHuman;
 import net.minecraft.server.v1_4_5.ItemStack;
 import net.minecraft.server.v1_4_5.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_5.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -243,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_4_6.EntityPlayer;
 import net.minecraft.server.v1_4_6.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_4_6.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_4_6.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_6;
 import net.minecraft.server.v1_4_6.ContainerChest;
 import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;
+import net.minecraft.server.v1_4_6.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.IInventory;
 import net.minecraft.server.v1_4_6.InventoryEnderChest;
 import net.minecraft.server.v1_4_6.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_6;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_4_6.EntityHuman;
 import net.minecraft.server.v1_4_6.ItemStack;
 import net.minecraft.server.v1_4_6.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_4_6.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -243,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 import net.minecraft.server.v1_4_R1.EntityPlayer;
 import net.minecraft.server.v1_4_R1.MinecraftServer;
 import net.minecraft.server.v1_4_R1.PlayerInteractManager;
@@ -30,10 +30,10 @@ import net.minecraft.server.v1_4_R1.PlayerInteractManager;
 import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
 
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -54,4 +54,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_R1;
 import net.minecraft.server.v1_4_R1.ContainerChest;
 import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;
+import net.minecraft.server.v1_4_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
 // Volatile
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
-import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.IInventory;
 import net.minecraft.server.v1_4_R1.InventoryEnderChest;
 import net.minecraft.server.v1_4_R1.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    @Override
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_4_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import net.minecraft.server.v1_4_R1.EntityHuman;
+// Volatile
 import net.minecraft.server.v1_4_R1.ItemStack;
 import net.minecraft.server.v1_4_R1.PlayerInventory;
 
-// Volatile
-import org.bukkit.craftbukkit.v1_4_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -243,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a_(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_5_R2.EntityPlayer;
 import net.minecraft.server.v1_5_R2.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_5_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_5_R2;
 import net.minecraft.server.v1_5_R2.ContainerChest;
 import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;
+import net.minecraft.server.v1_5_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.IInventory;
 import net.minecraft.server.v1_5_R2.InventoryEnderChest;
 import net.minecraft.server.v1_5_R2.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_5_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_5_R2.EntityHuman;
 import net.minecraft.server.v1_5_R2.ItemStack;
 import net.minecraft.server.v1_5_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -243,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_5_R3.EntityPlayer;
 import net.minecraft.server.v1_5_R3.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_5_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_5_R3;
 import net.minecraft.server.v1_5_R3.ContainerChest;
 import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;
+import net.minecraft.server.v1_5_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.IInventory;
 import net.minecraft.server.v1_5_R3.InventoryEnderChest;
 import net.minecraft.server.v1_5_R3.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_5_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_5_R3.EntityHuman;
 import net.minecraft.server.v1_5_R3.ItemStack;
 import net.minecraft.server.v1_5_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_5_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -243,14 +228,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
     @Override
     public String getName() {
-        if (player.name.length() > 16) {
-            return player.name.substring(0, 16);
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
         }
-        return player.name;
+        return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_6_R1.EntityPlayer;
 import net.minecraft.server.v1_6_R1.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R1;
 import net.minecraft.server.v1_6_R1.ContainerChest;
 import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;
+import net.minecraft.server.v1_6_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.IInventory;
 import net.minecraft.server.v1_6_R1.InventoryEnderChest;
 import net.minecraft.server.v1_6_R1.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java

@@ -16,30 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R1.EntityHuman;
 import net.minecraft.server.v1_6_R1.ItemStack;
 import net.minecraft.server.v1_6_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
 
-
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -50,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -71,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -213,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -250,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_6_R2.EntityPlayer;
 import net.minecraft.server.v1_6_R2.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R2;
 import net.minecraft.server.v1_6_R2.ContainerChest;
 import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;
+import net.minecraft.server.v1_6_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.IInventory;
 import net.minecraft.server.v1_6_R2.InventoryEnderChest;
 import net.minecraft.server.v1_6_R2.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R2.EntityHuman;
 import net.minecraft.server.v1_6_R2.ItemStack;
 import net.minecraft.server.v1_6_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_6_R3.EntityPlayer;
 import net.minecraft.server.v1_6_R3.MinecraftServer;
@@ -29,10 +29,10 @@ import net.minecraft.server.v1_6_R3.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         // Create an entity to load the player data
@@ -53,4 +53,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R3;
 import net.minecraft.server.v1_6_R3.ContainerChest;
 import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;
+import net.minecraft.server.v1_6_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried());
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.IInventory;
 import net.minecraft.server.v1_6_R3.InventoryEnderChest;
 import net.minecraft.server.v1_6_R3.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_6_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_6_R3.EntityHuman;
 import net.minecraft.server.v1_6_R3.ItemStack;
 import net.minecraft.server.v1_6_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_6_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack);
+            player.drop(itemstack);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R1/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_7_R1.EntityPlayer;
 import net.minecraft.server.v1_7_R1.MinecraftServer;
@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(null, offline.getName());
@@ -55,4 +55,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R1;
 import net.minecraft.server.v1_7_R1.ContainerChest;
 import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;
+import net.minecraft.server.v1_7_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.IInventory;
 import net.minecraft.server.v1_7_R1.InventoryEnderChest;
 import net.minecraft.server.v1_7_R1.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,9 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R1.EntityHuman;
 import net.minecraft.server.v1_7_R1.ItemStack;
 import net.minecraft.server.v1_7_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R2/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 //Volatile
 import net.minecraft.server.v1_7_R2.EntityPlayer;
 import net.minecraft.server.v1_7_R2.MinecraftServer;
@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(null, offline.getName());
@@ -55,4 +55,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getName();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R2;
 import net.minecraft.server.v1_7_R2.ContainerChest;
 import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.IInventory;
+import net.minecraft.server.v1_7_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.IInventory;
 import net.minecraft.server.v1_7_R2.InventoryEnderChest;
 import net.minecraft.server.v1_7_R2.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R2.EntityHuman;
 import net.minecraft.server.v1_7_R2.ItemStack;
 import net.minecraft.server.v1_7_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_7_R3.EntityPlayer;
 import net.minecraft.server.v1_7_R3.MinecraftServer;
@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
@@ -55,4 +55,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R3;
 import net.minecraft.server.v1_7_R3.ContainerChest;
 import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.IInventory;
+import net.minecraft.server.v1_7_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 // Volatile
-import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.IInventory;
 import net.minecraft.server.v1_7_R3.InventoryEnderChest;
 import net.minecraft.server.v1_7_R3.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R3.EntityHuman;
 import net.minecraft.server.v1_7_R3.ItemStack;
 import net.minecraft.server.v1_7_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java

@@ -16,12 +16,12 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-
 // Volatile
 import net.minecraft.server.v1_7_R4.EntityPlayer;
 import net.minecraft.server.v1_7_R4.MinecraftServer;
@@ -30,10 +30,10 @@ import net.minecraft.util.com.mojang.authlib.GameProfile;
 
 import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
@@ -55,4 +55,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R4;
 import net.minecraft.server.v1_7_R4.ContainerChest;
 import net.minecraft.server.v1_7_R4.EntityHuman;
 import net.minecraft.server.v1_7_R4.IInventory;
+import net.minecraft.server.v1_7_R4.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialEnderChest.java

@@ -20,15 +20,14 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
-import com.lishid.openinv.internal.ISpecialEnderChest;
-
 //Volatile
-import net.minecraft.server.v1_7_R4.EntityHuman;
 import net.minecraft.server.v1_7_R4.IInventory;
 import net.minecraft.server.v1_7_R4.InventoryEnderChest;
 import net.minecraft.server.v1_7_R4.InventorySubcontainer;
@@ -39,12 +38,13 @@ import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
     public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
     public boolean playerOnline = false;
     private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
     private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
     public SpecialEnderChest(Player p, Boolean online) {
         super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
@@ -59,15 +59,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
@@ -84,9 +75,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
@@ -102,7 +97,6 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     @Override
     public void onClose(CraftHumanEntity who) {
         transaction.remove(who);
-        this.inventoryRemovalCheck(true);
     }
 
     @Override
@@ -125,22 +119,10 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return maxStack;
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    @Override
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
-    }
-
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_7_R4;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_7_R4.EntityHuman;
 import net.minecraft.server.v1_7_R4.ItemStack;
 import net.minecraft.server.v1_7_R4.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java

@@ -16,13 +16,14 @@
 
 package com.lishid.openinv.internal.v1_8_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.mojang.authlib.GameProfile;
-
 import net.minecraft.server.v1_8_R1.EntityPlayer;
 import net.minecraft.server.v1_8_R1.MinecraftServer;
 import net.minecraft.server.v1_8_R1.PlayerInteractManager;
@@ -30,10 +31,10 @@ import net.minecraft.server.v1_8_R1.PlayerInteractManager;
 //Volatile
 import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
         // Create an entity to load the player data
@@ -54,4 +55,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R1;
 import net.minecraft.server.v1_8_R1.ContainerChest;
 import net.minecraft.server.v1_8_R1.EntityHuman;
 import net.minecraft.server.v1_8_R1.IInventory;
+import net.minecraft.server.v1_8_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialEnderChest.java

@@ -17,40 +17,31 @@
 package com.lishid.openinv.internal.v1_8_R1;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
-import net.minecraft.server.v1_8_R1.EntityHuman;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+//Volatile
 import net.minecraft.server.v1_8_R1.IInventory;
 import net.minecraft.server.v1_8_R1.InventoryEnderChest;
 import net.minecraft.server.v1_8_R1.InventorySubcontainer;
-import net.minecraft.server.v1_8_R1.ItemStack;
 
-//Volatile
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
-    private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
-    private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
         this.items = enderChest.getContents();
     }
 
@@ -59,21 +50,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = craftPlayer.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
@@ -84,62 +67,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
     }
 
     @Override
-    public ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-        this.inventoryRemovalCheck(true);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_8_R1;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
-import net.minecraft.server.v1_8_R1.EntityHuman;
-import net.minecraft.server.v1_8_R1.ItemStack;
 //Volatile
+import net.minecraft.server.v1_8_R1.ItemStack;
 import net.minecraft.server.v1_8_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_8_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(items, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java

@@ -16,13 +16,14 @@
 
 package com.lishid.openinv.internal.v1_8_R2;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.mojang.authlib.GameProfile;
-
 // Volatile
 import net.minecraft.server.v1_8_R2.EntityPlayer;
 import net.minecraft.server.v1_8_R2.MinecraftServer;
@@ -30,10 +31,10 @@ import net.minecraft.server.v1_8_R2.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
@@ -55,4 +56,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R2;
 import net.minecraft.server.v1_8_R2.ContainerChest;
 import net.minecraft.server.v1_8_R2.EntityHuman;
 import net.minecraft.server.v1_8_R2.IInventory;
+import net.minecraft.server.v1_8_R2.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialEnderChest.java

@@ -17,40 +17,31 @@
 package com.lishid.openinv.internal.v1_8_R2;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
 // Volatile
-import net.minecraft.server.v1_8_R2.EntityHuman;
 import net.minecraft.server.v1_8_R2.IInventory;
 import net.minecraft.server.v1_8_R2.InventoryEnderChest;
 import net.minecraft.server.v1_8_R2.InventorySubcontainer;
-import net.minecraft.server.v1_8_R2.ItemStack;
 
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R2.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
-    private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
-    private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
         this.items = enderChest.getContents();
     }
 
@@ -59,21 +50,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = craftPlayer.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
@@ -84,62 +67,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
     }
 
     @Override
-    public ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-        this.inventoryRemovalCheck(true);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_8_R2;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_8_R2.EntityHuman;
 import net.minecraft.server.v1_8_R2.ItemStack;
 import net.minecraft.server.v1_8_R2.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R2.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(armor, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R3/PlayerDataManager.java

@@ -16,13 +16,14 @@
 
 package com.lishid.openinv.internal.v1_8_R3;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.mojang.authlib.GameProfile;
-
 import net.minecraft.server.v1_8_R3.EntityPlayer;
 import net.minecraft.server.v1_8_R3.MinecraftServer;
 import net.minecraft.server.v1_8_R3.PlayerInteractManager;
@@ -30,10 +31,10 @@ import net.minecraft.server.v1_8_R3.PlayerInteractManager;
 //Volatile
 import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
 
         GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
@@ -55,4 +56,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R3;
 import net.minecraft.server.v1_8_R3.ContainerChest;
 import net.minecraft.server.v1_8_R3.EntityHuman;
 import net.minecraft.server.v1_8_R3.IInventory;
+import net.minecraft.server.v1_8_R3.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialEnderChest.java

@@ -17,40 +17,31 @@
 package com.lishid.openinv.internal.v1_8_R3;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
 // Volatile
-import net.minecraft.server.v1_8_R3.EntityHuman;
 import net.minecraft.server.v1_8_R3.IInventory;
 import net.minecraft.server.v1_8_R3.InventoryEnderChest;
 import net.minecraft.server.v1_8_R3.InventorySubcontainer;
-import net.minecraft.server.v1_8_R3.ItemStack;
 
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
-    private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
-    private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
         this.items = enderChest.getContents();
     }
 
@@ -59,21 +50,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = craftPlayer.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
@@ -84,62 +67,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
     }
 
     @Override
-    public ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-        this.inventoryRemovalCheck(true);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java

@@ -16,29 +16,26 @@
 
 package com.lishid.openinv.internal.v1_8_R3;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 //Volatile
-import net.minecraft.server.v1_8_R3.EntityHuman;
 import net.minecraft.server.v1_8_R3.ItemStack;
 import net.minecraft.server.v1_8_R3.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[5];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         this.items = player.inventory.items;
         this.armor = player.inventory.armor;
@@ -49,20 +46,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             this.player.inventory.items = this.items;
             this.player.inventory.armor = this.armor;
             playerOnline = true;
@@ -70,23 +57,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(armor, 0, C, items.length, armor.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        return contents;
     }
 
     @Override
@@ -212,13 +197,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -249,8 +234,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_9_R1/PlayerDataManager.java

@@ -16,13 +16,14 @@
 
 package com.lishid.openinv.internal.v1_9_R1;
 
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.lishid.openinv.internal.IPlayerDataManager;
-import com.mojang.authlib.GameProfile;
-
 // Volatile
 import net.minecraft.server.v1_9_R1.EntityPlayer;
 import net.minecraft.server.v1_9_R1.MinecraftServer;
@@ -30,10 +31,10 @@ import net.minecraft.server.v1_9_R1.PlayerInteractManager;
 
 import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
 
-public class PlayerDataManager extends IPlayerDataManager {
+public class PlayerDataManager implements IPlayerDataManager {
 
     @Override
-    public Player loadOfflinePlayer(OfflinePlayer offline) {
+    public Player loadPlayer(OfflinePlayer offline) {
         if (offline == null || !offline.hasPlayedBefore()) {
             return null;
         }
@@ -57,4 +58,5 @@ public class PlayerDataManager extends IPlayerDataManager {
     public String getPlayerDataID(OfflinePlayer player) {
         return player.getUniqueId().toString();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java

@@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_9_R1;
 import net.minecraft.server.v1_9_R1.ContainerChest;
 import net.minecraft.server.v1_9_R1.EntityHuman;
 import net.minecraft.server.v1_9_R1.IInventory;
+import net.minecraft.server.v1_9_R1.PlayerInventory;
 
 public class SilentContainerChest extends ContainerChest {
     public IInventory inv;
@@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest {
     }
 
     @Override
-    public void b(EntityHuman paramEntityHuman) {
+    public void b(EntityHuman entityHuman) {
         // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
     }
 }

src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialEnderChest.java

@@ -17,40 +17,31 @@
 package com.lishid.openinv.internal.v1_9_R1;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
 // Volatile
-import net.minecraft.server.v1_9_R1.EntityHuman;
 import net.minecraft.server.v1_9_R1.IInventory;
 import net.minecraft.server.v1_9_R1.InventoryEnderChest;
 import net.minecraft.server.v1_9_R1.InventorySubcontainer;
-import net.minecraft.server.v1_9_R1.ItemStack;
 
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory;
 
 public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
-    public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
-    public boolean playerOnline = false;
-    private CraftPlayer owner;
-    private final InventoryEnderChest enderChest;
-    private int maxStack = MAX_STACK;
-    private final CraftInventory inventory = new CraftInventory(this);
 
-    public SpecialEnderChest(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
-        CraftPlayer player = (CraftPlayer) p;
-        this.enderChest = player.getHandle().getEnderChest();
-        this.owner = player;
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
         this.items = enderChest.getContents();
     }
 
@@ -59,21 +50,13 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
             try {
-                owner = (CraftPlayer) player;
-                InventoryEnderChest playerEnderChest = owner.getHandle().getEnderChest();
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = craftPlayer.getHandle().getEnderChest();
                 Field field = playerEnderChest.getClass().getField("items");
                 field.setAccessible(true);
                 field.set(playerEnderChest, this.items);
@@ -84,62 +67,19 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return inventoryRemovalCheck(false);
     }
 
     @Override
-    public ItemStack[] getContents() {
-        return this.items;
-    }
-
-    @Override
-    public void onOpen(CraftHumanEntity who) {
-        transaction.add(who);
-    }
-
-    @Override
-    public void onClose(CraftHumanEntity who) {
-        transaction.remove(who);
-        this.inventoryRemovalCheck(true);
-    }
-
-    @Override
-    public List<HumanEntity> getViewers() {
-        return transaction;
-    }
-
-    @Override
-    public InventoryHolder getOwner() {
-        return this.owner;
-    }
-
-    @Override
-    public void setMaxStackSize(int size) {
-        maxStack = size;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return maxStack;
-    }
-
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
-
-    public void startOpen() {
-
-    }
-
-    public void f() {
-
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public void update() {
+        super.update();
         enderChest.update();
     }
+
 }

src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java

@@ -19,29 +19,26 @@ package com.lishid.openinv.internal.v1_9_R1;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-
 // Volatile
-import net.minecraft.server.v1_9_R1.EntityHuman;
 import net.minecraft.server.v1_9_R1.ItemStack;
 import net.minecraft.server.v1_9_R1.PlayerInventory;
 
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftHumanEntity;
 import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftInventory;
 
 public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
-    CraftPlayer owner;
-    public boolean playerOnline = false;
+
     private final ItemStack[] extra = new ItemStack[4];
     private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
 
-    public SpecialPlayerInventory(Player p, Boolean online) {
-        super(((CraftPlayer) p).getHandle());
-        this.owner = ((CraftPlayer) p);
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
         this.playerOnline = online;
         setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
     }
@@ -88,44 +85,32 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return inventory;
     }
 
-    @Override
-    public boolean inventoryRemovalCheck(boolean save) {
-        boolean offline = transaction.isEmpty() && !playerOnline;
-        if (offline && save) {
-            owner.saveData();
-        }
-        return offline;
-    }
-
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            owner = (CraftPlayer) player;
-            this.player = owner.getHandle();
+            this.player = ((CraftPlayer) player).getHandle();
             setItemArrays(this.player.inventory, items, armor, extraSlots);
             playerOnline = true;
         }
     }
 
     @Override
-    public boolean setPlayerOffline() {
+    public void setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck(false);
     }
 
     @Override
-    public void onClose(CraftHumanEntity who) {
-        super.onClose(who);
-        this.inventoryRemovalCheck(true);
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
     }
 
     @Override
     public ItemStack[] getContents() {
-        ItemStack[] C = new ItemStack[getSize()];
-        System.arraycopy(items, 0, C, 0, items.length);
-        System.arraycopy(armor, 0, C, items.length, armor.length);
-        System.arraycopy(extraSlots, 0, C, items.length + armor.length, extraSlots.length);
-        return C;
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
+        return contents;
     }
 
     @Override
@@ -273,13 +258,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
 
         // Effects
         if (is == this.extra) {
-            owner.getHandle().drop(itemstack, true);
+            player.drop(itemstack, true);
             itemstack = null;
         }
 
         is[i] = itemstack;
 
-        owner.getHandle().defaultContainer.b();
+        player.defaultContainer.b();
     }
 
     private int getReversedItemSlotNum(int i) {
@@ -310,8 +295,4 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
         return player.getName();
     }
 
-    @Override
-    public boolean a(EntityHuman entityhuman) {
-        return true;
-    }
 }

src/main/java/com/lishid/openinv/internal/v1_9_R2/AnySilentChest.java

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.lishid.openinv.internal.IAnySilentChest;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.AxisAlignedBB;
+import net.minecraft.server.v1_9_R2.Block;
+import net.minecraft.server.v1_9_R2.BlockPosition;
+import net.minecraft.server.v1_9_R2.Entity;
+import net.minecraft.server.v1_9_R2.EntityOcelot;
+import net.minecraft.server.v1_9_R2.EntityPlayer;
+import net.minecraft.server.v1_9_R2.IInventory;
+import net.minecraft.server.v1_9_R2.ITileInventory;
+import net.minecraft.server.v1_9_R2.InventoryLargeChest;
+import net.minecraft.server.v1_9_R2.PacketPlayOutOpenWindow;
+import net.minecraft.server.v1_9_R2.TileEntityChest;
+import net.minecraft.server.v1_9_R2.World;
+
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+
+public class AnySilentChest implements IAnySilentChest {
+    @Override
+    public boolean isAnyChestNeeded(Player p, int x, int y, int z) {
+        // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        // If block or ocelot on top
+        if (world.getType(new BlockPosition(x, y + 1, z)).l() || hasOcelotOnTop(world, x, y, z))
+            return true;
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        // If block next to chest is chest and has a block or ocelot on top
+        if (isBlockedChest(world, id, x - 1, y, z))
+            return true;
+        if (isBlockedChest(world, id, x + 1, y, z))
+            return true;
+        if (isBlockedChest(world, id, x, y, z - 1))
+            return true;
+        if (isBlockedChest(world, id, x, y, z + 1))
+            return true;
+
+        return false;
+    }
+
+    private boolean isBlockedChest(World world, int id, int x, int y, int z) {
+        BlockPosition position = new BlockPosition(x, y, z);
+        if (Block.getId(world.getType(position).getBlock()) != id) {
+            return false;
+        }
+
+        if (world.getType(position).l()) {
+            return true;
+        }
+
+        return hasOcelotOnTop(world, x, y, z);
+    }
+
+    private boolean hasOcelotOnTop(World world, int x, int y, int z) {
+        for (Entity localEntity : world.a(EntityOcelot.class,
+                new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1))) {
+            EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
+            if (localEntityOcelot.isSitting()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean activateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
+        EntityPlayer player = ((CraftPlayer) p).getHandle();
+        World world = player.world;
+        Object chest = world.getTileEntity(new BlockPosition(x, y, z));
+        if (chest == null)
+            return true;
+
+        int id = Block.getId(world.getType(new BlockPosition(x, y, z)).getBlock());
+
+        if (!anychest) {
+            if (world.getType(new BlockPosition(x, y + 1, z)).l())
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x - 1, y + 1, z)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id) && (world.getType(new BlockPosition(x + 1, y + 1, z)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x, y, z - 1)).getBlock()) == id) && (world.getType(new BlockPosition(x, y + 1, z - 1)).l()))
+                return true;
+            if ((Block.getId(world.getType(new BlockPosition(x, y, z + 1)).getBlock()) == id) && (world.getType(new BlockPosition(x, y + 1, z + 1)).l()))
+                return true;
+        }
+
+        if (Block.getId(world.getType(new BlockPosition(x - 1, y, z)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x - 1, y, z)), (ITileInventory) chest);
+        if (Block.getId(world.getType(new BlockPosition(x + 1, y, z)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x + 1, y, z)));
+        if (Block.getId(world.getType(new BlockPosition(x, y, z - 1)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z - 1)), (ITileInventory) chest);
+        if (Block.getId(world.getType(new BlockPosition(x, y, z + 1)).getBlock()) == id)
+            chest = new InventoryLargeChest("Large chest", (ITileInventory) chest, (TileEntityChest) world.getTileEntity(new BlockPosition(x, y, z + 1)));
+
+        boolean returnValue = true;
+        if (!silentchest) {
+            player.openContainer((IInventory) chest);
+        }
+        else {
+            try {
+                SilentContainerChest silentContainerChest = new SilentContainerChest(player.inventory, ((IInventory) chest), player);
+                int windowId = player.nextContainerCounter();
+                player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, "minecraft:chest", ((IInventory) chest).getScoreboardDisplayName(), ((IInventory) chest).getSize()));
+                player.activeContainer = silentContainerChest;
+                player.activeContainer.windowId = windowId;
+                player.activeContainer.addSlotListener(player);
+                returnValue = false;
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
+            }
+        }
+
+        return returnValue;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_9_R2/InventoryAccess.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+import java.lang.reflect.Field;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.Inventory;
+
+import com.lishid.openinv.OpenInv;
+import com.lishid.openinv.Permissions;
+import com.lishid.openinv.internal.IInventoryAccess;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.IInventory;
+
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory;
+
+public class InventoryAccess implements IInventoryAccess {
+    @Override
+    public boolean check(Inventory inventory, HumanEntity player) {
+        IInventory inv = grabInventory(inventory);
+        
+        if (inv instanceof SpecialPlayerInventory) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
+                return false;
+            }
+        }
+
+        else if (inv instanceof SpecialEnderChest) {
+            if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+    
+    private IInventory grabInventory(Inventory inventory) {
+        if(inventory instanceof CraftInventory) {
+            return ((CraftInventory) inventory).getInventory();
+        }
+        
+        //Use reflection to find the iinventory
+        Class<? extends Inventory> clazz = inventory.getClass();
+        IInventory result = null;
+        for(Field f : clazz.getDeclaredFields()) {
+            f.setAccessible(true);
+            if(IInventory.class.isAssignableFrom(f.getDeclaringClass())) {
+                try {
+                    result = (IInventory) f.get(inventory);
+                }
+                catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_9_R2/PlayerDataManager.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+import com.lishid.openinv.internal.IPlayerDataManager;
+
+import com.mojang.authlib.GameProfile;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.EntityPlayer;
+import net.minecraft.server.v1_9_R2.MinecraftServer;
+import net.minecraft.server.v1_9_R2.PlayerInteractManager;
+
+import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
+
+public class PlayerDataManager implements IPlayerDataManager {
+
+    @Override
+    public Player loadPlayer(OfflinePlayer offline) {
+        if (offline == null || !offline.hasPlayedBefore()) {
+            return null;
+        }
+        GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
+        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
+        // Create an entity to load the player data
+        EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile, new PlayerInteractManager(server.getWorldServer(0)));
+
+        // Get the bukkit entity
+        Player target = (entity == null) ? null : entity.getBukkitEntity();
+        if (target != null) {
+            // Load data
+            target.loadData();
+            // Return the entity
+            return target;
+        }
+        return null;
+    }
+
+    @Override
+    public String getPlayerDataID(OfflinePlayer player) {
+        return player.getUniqueId().toString();
+    }
+
+}

src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.ContainerChest;
+import net.minecraft.server.v1_9_R2.EntityHuman;
+import net.minecraft.server.v1_9_R2.IInventory;
+import net.minecraft.server.v1_9_R2.PlayerInventory;
+
+public class SilentContainerChest extends ContainerChest {
+    public IInventory inv;
+
+    public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
+        super(i1, i2, e1);
+        inv = i2;
+        // close signal
+        inv.closeContainer(e1);
+    }
+
+    @Override
+    public void b(EntityHuman entityHuman) {
+        // Don't send close signal twice, might screw up
+        PlayerInventory playerinventory = entityHuman.inventory;
+
+        if (playerinventory.getCarried() != null) {
+            entityHuman.drop(playerinventory.getCarried(), false);
+            playerinventory.setCarried(null);
+        }
+    }
+}

src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialEnderChest.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+import java.lang.reflect.Field;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.IInventory;
+import net.minecraft.server.v1_9_R2.InventoryEnderChest;
+import net.minecraft.server.v1_9_R2.InventorySubcontainer;
+
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory;
+
+public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
+
+    private final InventoryEnderChest enderChest;
+    private final CraftInventory inventory = new CraftInventory(this);
+    public boolean playerOnline = false;
+
+    public SpecialEnderChest(Player player, Boolean online) {
+        super(((CraftPlayer) player).getHandle().getEnderChest().getName(), ((CraftPlayer) player).getHandle().getEnderChest().hasCustomName(), ((CraftPlayer) player).getHandle().getEnderChest().getSize());
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        this.enderChest = craftPlayer.getHandle().getEnderChest();
+        this.bukkitOwner = craftPlayer;
+        this.items = enderChest.getContents();
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            try {
+                this.bukkitOwner = player;
+                CraftPlayer craftPlayer = (CraftPlayer) player;
+                InventoryEnderChest playerEnderChest = craftPlayer.getHandle().getEnderChest();
+                Field field = playerEnderChest.getClass().getField("items");
+                field.setAccessible(true);
+                field.set(playerEnderChest, this.items);
+            }
+            catch (Exception e) {}
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        enderChest.update();
+    }
+
+}

src/main/java/com/lishid/openinv/internal/v1_9_R2/SpecialPlayerInventory.java

@@ -0,0 +1,304 @@
+/*
+ * Copyright (C) 2011-2014 lishid.  All rights reserved.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,  version 3.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_9_R2;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+// Volatile
+import net.minecraft.server.v1_9_R2.ItemStack;
+import net.minecraft.server.v1_9_R2.PlayerInventory;
+
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftInventory;
+
+public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
+
+    private final ItemStack[] extra = new ItemStack[4];
+    private final CraftInventory inventory = new CraftInventory(this);
+    private boolean playerOnline = false;
+
+    public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
+        super(((CraftPlayer) bukkitPlayer).getHandle());
+        this.playerOnline = online;
+        setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
+    }
+
+    private void setItemArrays(PlayerInventory inventory, ItemStack[] items, ItemStack[] armor,
+            ItemStack[] extraSlots) {
+        try {
+            // Prepare to remove final modifier
+            Field modifiers = Field.class.getDeclaredField("modifiers");
+            modifiers.setAccessible(true);
+
+            // Access and replace main inventory array
+            Field field = PlayerInventory.class.getField("items");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, items);
+
+            // Access and replace armor inventory array
+            field = PlayerInventory.class.getField("armor");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, armor);
+
+            // Access and replace offhand inventory array
+            field = PlayerInventory.class.getField("extraSlots");
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, extraSlots);
+
+            // Access and replace array containing all inventory arrays
+            field = PlayerInventory.class.getDeclaredField("g");
+            field.setAccessible(true);
+            modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            field.set(inventory, new ItemStack[][] { items, armor, extraSlots });
+        } catch (NoSuchFieldException e) {
+            // Unable to set final fields to item arrays, we're screwed. Noisily fail.
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Inventory getBukkitInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void setPlayerOnline(Player player) {
+        if (!playerOnline) {
+            this.player = ((CraftPlayer) player).getHandle();
+            setItemArrays(this.player.inventory, items, armor, extraSlots);
+            playerOnline = true;
+        }
+    }
+
+    @Override
+    public void setPlayerOffline() {
+        playerOnline = false;
+    }
+
+    @Override
+    public boolean isInUse() {
+        return !this.getViewers().isEmpty();
+    }
+
+    @Override
+    public void onClose(CraftHumanEntity who) {
+        super.onClose(who);
+    }
+
+    @Override
+    public ItemStack[] getContents() {
+        ItemStack[] contents = new ItemStack[getSize()];
+        System.arraycopy(items, 0, contents, 0, items.length);
+        System.arraycopy(armor, 0, contents, items.length, armor.length);
+        System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
+        return contents;
+    }
+
+    @Override
+    public int getSize() {
+        return super.getSize() + 5;
+    }
+
+    @Override
+    public ItemStack getItem(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        // extraSlots is, for now, just an array with length 1. No need for special handling.
+
+        return is[i];
+    }
+
+    @Override
+    public ItemStack splitStack(int i, int j) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack;
+
+            if (is[i].count <= j) {
+                itemstack = is[i];
+                is[i] = null;
+                return itemstack;
+            }
+            else {
+                itemstack = is[i].cloneAndSubtract(j);
+                if (is[i].count == 0) {
+                    is[i] = null;
+                }
+
+                return itemstack;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public ItemStack splitWithoutUpdate(int i) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        if (is[i] != null) {
+            ItemStack itemstack = is[i];
+
+            is[i] = null;
+            return itemstack;
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setItem(int i, ItemStack itemstack) {
+        ItemStack[] is = this.items;
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.armor;
+        }
+        else {
+            i = getReversedItemSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extraSlots;
+        }
+        else if (is == this.armor) {
+            i = getReversedArmorSlotNum(i);
+        }
+
+        if (i >= is.length) {
+            i -= is.length;
+            is = this.extra;
+        }
+
+        // Effects
+        if (is == this.extra) {
+            player.drop(itemstack, true);
+            itemstack = null;
+        }
+
+        is[i] = itemstack;
+
+        player.defaultContainer.b();
+    }
+
+    private int getReversedItemSlotNum(int i) {
+        if (i >= 27)
+            return i - 27;
+        else
+            return i + 9;
+    }
+
+    private int getReversedArmorSlotNum(int i) {
+        if (i == 0)
+            return 3;
+        if (i == 1)
+            return 2;
+        if (i == 2)
+            return 1;
+        if (i == 3)
+            return 0;
+        else
+            return i;
+    }
+
+    @Override
+    public String getName() {
+        if (player.getName().length() > 16) {
+            return player.getName().substring(0, 16);
+        }
+        return player.getName();
+    }
+
+}

src/main/java/com/lishid/openinv/util/Cache.java

@@ -0,0 +1,160 @@
+package com.lishid.openinv.util;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
+
+/**
+ * A minimal time-based cache implementation backed by a HashMap and TreeMultimap.
+ * 
+ * @author Jikoo
+ */
+public class Cache<K, V> {
+
+    private final Map<K, V> internal;
+    private final Multimap<Long, K> expiry;
+    private final long retention;
+    private final Function<V> inUseCheck, postRemoval;
+
+    /**
+     * Constructs a Cache with the specified retention duration, in use function, and post-removal function.
+     * 
+     * @param retention duration after which keys are automatically invalidated if not in use
+     * @param inUseCheck Function used to check if a key is considered in use
+     * @param postRemoval Function used to perform any operations required when a key is invalidated
+     */
+    public Cache(long retention, Function<V> inUseCheck, Function<V> postRemoval) {
+        this.internal = new HashMap<K, V>();
+
+        this.expiry = TreeMultimap.create(new Comparator<Long>() {
+                    @Override
+                    public int compare(Long long1, Long long2) {
+                        return long1.compareTo(long2);
+                    }
+                },
+                new Comparator<K>() {
+                    @Override
+                    public int compare(K k1, K k2) {
+                        return 0;
+                    }
+                });
+
+        this.retention = retention;
+        this.inUseCheck = inUseCheck;
+        this.postRemoval = postRemoval;
+    }
+
+    /**
+     * Set a key and value pair. Keys are unique. Using an existing key will cause the old value to
+     * be overwritten and the expiration timer to be reset.
+     * 
+     * @param key key with which the specified value is to be associated
+     * @param value value to be associated with the specified key
+     */
+    public void put(K key, V value) {
+        // Invalidate key - runs lazy check and ensures value won't be cleaned up early
+        invalidate(key);
+
+        internal.put(key, value);
+        expiry.put(System.currentTimeMillis() + retention, key);
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped, or null if no value is mapped for the key.
+     * 
+     * @param key the key whose associated value is to be returned
+     * @return the value to which the specified key is mapped, or null if no value is mapped for the key
+     */
+    public V get(K key) {
+        // Run lazy check to clean cache
+        lazyCheck();
+
+        return internal.get(key);
+    }
+
+    /**
+     * Returns true if the specified key is mapped to a value.
+     * 
+     * @param key key to check if a mapping exists for
+     * @return true if a mapping exists for the specified key
+     */
+    public boolean containsKey(K key) {
+        // Run lazy check to clean cache
+        lazyCheck();
+
+        return internal.containsKey(key);
+    }
+
+    /**
+     * Forcibly invalidates a key, even if it is considered to be in use.
+     * 
+     * @param key key to invalidate
+     */
+    public void invalidate(K key) {
+        // Run lazy check to clean cache
+        lazyCheck();
+
+        if (!internal.containsKey(key)) {
+            // Value either not present or cleaned by lazy check. Either way, we're good
+            return;
+        }
+
+        // Remove stored object
+        internal.remove(key);
+
+        // Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
+        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
+            if (key.equals(iterator.next().getValue())) {
+                iterator.remove();
+                break;
+            }
+        }
+    }
+
+    /**
+     * Forcibly invalidates all keys, even if they are considered to be in use.
+     */
+    public void invalidateAll() {
+        for (V value : internal.values()) {
+            postRemoval.run(value);
+        }
+        expiry.clear();
+        internal.clear();
+    }
+
+    /**
+     * Invalidate all expired keys that are not considered in use. If a key is expired but is
+     * considered in use by the provided Function, its expiration time is reset.
+     */
+    private void lazyCheck() {
+        long now = System.currentTimeMillis();
+        long nextExpiry = now + retention;
+        for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
+            Map.Entry<Long, K> entry = iterator.next();
+
+            if (entry.getKey() > now) {
+                break;
+            }
+
+            iterator.remove();
+
+            if (inUseCheck.run(internal.get(entry.getValue()))) {
+                expiry.put(nextExpiry, entry.getValue());
+                continue;
+            }
+
+            V value = internal.remove(entry.getValue());
+
+            if (value == null) {
+                continue;
+            }
+
+            postRemoval.run(value);
+        }
+    }
+
+}

src/main/java/com/lishid/openinv/util/Function.java

@@ -0,0 +1,12 @@
+package com.lishid.openinv.util;
+
+/**
+ * Abstraction for some simple cache calls.
+ * 
+ * @author Jikoo
+ */
+public abstract class Function<V> {
+
+    public abstract boolean run(V value);
+
+}

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: OpenInv
 main: com.lishid.openinv.OpenInv
-version: 2.4.3
+version: 2.5.0
 author: lishid
 authors: [Jikoo]
 description: >
@@ -9,31 +9,31 @@ commands:
   openinv:
     aliases: [oi, inv, open]
     description: Open a player's inventory
-    permission: OpenInv.openinv
+    permission: OpenInv.*;OpenInv.openinv
     usage: |
            /<command> - Open last person's inventory
            /<command> <Player> - Open a player's inventory
   openender:
     aliases: [oe]
     description: Opens the enderchest of a player
-    permission: OpenInv.openender
+    permission: OpenInv.*;OpenInv.openender
     usage: |
            /<command> <Player> - Opens a player's enderchest
   searchinv:
     aliases: [si]
     description: Search and list players having a specific item
-    permission: OpenInv.search
+    permission: OpenInv.*;OpenInv.search
     usage: |
            /<command> <Item> [MinAmount] - Item can be the Item ID or the CraftBukkit Item Name, MinAmount is the minimum amount to be considered.
   silentchest:
     aliases: [sc, silent]
     description: Toggle silent chest function, which hides the animation of a chest when opened or closed, and suppresses the sound.
-    permission: OpenInv.silent
+    permission: OpenInv.*;OpenInv.silent
     usage: |
            /<command> [Check] - Checks whether silent chest is enabled
   anychest:
     aliases: [ac]
     description: Toggle anychest function, which allows opening of blocked chests.
-    permission: OpenInv.anychest
+    permission: OpenInv.*;OpenInv.anychest
     usage: |
            /<command> [Check] - Checks whether anychest is enabled