Fixed NPE with InventoryPickupItemEvent and cleaned up InventoryMoveItemEvent