Fixed shops not working after reload command, closes #19

onebone · Jan 25, 2015 · 3696e98 · 3696e98
1 parent d7c39ae
commit 3696e98
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/EconomyAPI/src/onebone/economyapi/EconomyAPI.php b/EconomyAPI/src/onebone/economyapi/EconomyAPI.php
@@ -95,9 +95,8 @@ public static function getInstance(){
 	}
 
 	public function onLoad(){
-		if(!self::$obj instanceof EconomyAPI){
-			self::$obj = $this;
-		}
+		self::$obj = $this;
+
 		$this->path = $this->getDataFolder();
 
 		$this->scheduleId = array();

diff --git a/EconomyShop/plugin.yml b/EconomyShop/plugin.yml
@@ -8,7 +8,6 @@ api:
 main: onebone\economyshop\EconomyShop
 author: onebone
 depend: [EconomyAPI]
-load: POSTWORLD
 
 permissions:
  economyshop.*:

diff --git a/EconomyShop/src/onebone/economyshop/EconomyShop.php b/EconomyShop/src/onebone/economyshop/EconomyShop.php
@@ -39,17 +39,15 @@ class EconomyShop extends PluginBase implements Listener{
 	private static $instance;
 
 	public function onEnable(){
-		if(self::$instance instanceof EconomyShop){
-			return;
-		}
-		self::$instance = $this;
 		@mkdir($this->getDataFolder());
 		$this->shop = (new Config($this->getDataFolder()."Shops.yml", Config::YAML))->getAll();
 		$this->getServer()->getPluginManager()->registerEvents($this, $this);
 		$this->prepareLangPref();
 		$this->placeQueue = array();
 
 		ItemList::$items = (new Config($this->getDataFolder()."items.properties", Config::PROPERTIES, ItemList::$items))->getAll();
+
+		self::$instance = $this;
 	}
 
 	public function getShops(){