From 7ccf1083d2e60e53937787531b23e58296d9973a Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Sun, 20 May 2018 18:58:56 +0100
Subject: [PATCH] Change to require

---
 ExpCore/load.lua | 10 +++++-----
 StdLib/load.lua  | 12 ++++++------
 control.lua      | 11 +++++++++--
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ExpCore/load.lua b/ExpCore/load.lua
index ac2b5610..2365a0c5 100644
--- a/ExpCore/load.lua
+++ b/ExpCore/load.lua
@@ -17,11 +17,11 @@ Pass a table with the names of the objects you want and it will be return in tha
 
 local StdExpCoreLib = {}
 
-require('/commands')
-StdExpCoreLib.Ranking = require('/ranking')
-StdExpCoreLib.Server = require('/server')
-StdExpCoreLib.Sync = require('/sync')
-StdExpCoreLib.Gui = require('/gui')
+require('commands')
+StdExpCoreLib.Ranking = require('ranking')
+StdExpCoreLib.Server = require('server')
+StdExpCoreLib.Sync = require('sync')
+StdExpCoreLib.Gui = require('gui')
 verbose('Begain Gui Part Loading')
 StdExpCoreLib.Gui:_load_parts{
     'inputs',
diff --git a/StdLib/load.lua b/StdLib/load.lua
index 85cab6be..0ee0dc47 100644
--- a/StdLib/load.lua
+++ b/StdLib/load.lua
@@ -17,12 +17,12 @@ Pass a table with the names of the objects you want and it will be return in tha
 
 local StdLib = {}
 
-require('/table')
-require('/string')
-require('/time')
-StdLib.Color = require('/color')
-StdLib.Game = require('/game')
-StdLib.Event = require('/event')
+require('table')
+require('string')
+require('time')
+StdLib.Color = require('color')
+StdLib.Game = require('game')
+StdLib.Event = require('event')
 
 return function(rtn)
     local _return = {}
diff --git a/control.lua b/control.lua
index e96f0680..21cbe7d0 100644
--- a/control.lua
+++ b/control.lua
@@ -33,9 +33,16 @@ verbose('============================= START =============================')
 require_return_err = false -- Set to false when removing files; set to true for debuging
 _require = require
 require = function(path)
+    local _path = path
+    if not string.sub(path,1) == '/' then path = '/'..path end
     local _return = {pcall(_require,path)}
-    if not table.remove(_return, 1) then verbose('Failed to load: '..path..' ('.._return[1]..')') if require_return_err then error(unpack(_return)) end
-    else verbose('Loaded: '..path) end
+    if not table.remove(_return, 1) then
+        local __return = {pcall(_require,'/..'..path)}
+        if not table.remove(__return, 1) then
+            verbose('Failed to load: '.._path..' ('.._return[1]..')') 
+            if require_return_err then error(unpack(_return)) end
+        else verbose('Loaded: '.._path) return unpack(__return) end
+    else verbose('Loaded: '.._path) end
     return unpack(_return)
 end