Fix for non-loading plugins

This commit is contained in:
Shoghi Cervantes Pueyo 2013-01-13 14:02:57 +01:00
parent ce7c7efc79
commit 109b44a205

View File

@ -198,7 +198,7 @@ class ServerAPI{
while(false !== ($file = $dir->read())){ while(false !== ($file = $dir->read())){
if($file{0} !== "."){ //Hidden and upwards folders if($file{0} !== "."){ //Hidden and upwards folders
$API = basename($file, ".php"); $API = basename($file, ".php");
if(strtolower($API) !== "serverapi"){ if(strtolower($API) !== "serverapi" and strtolower($API) !== "pluginapi"){
$name = strtolower(substr($API, 0, -3)); $name = strtolower(substr($API, 0, -3));
$this->loadAPI($name, $API); $this->loadAPI($name, $API);
} }
@ -209,6 +209,9 @@ class ServerAPI{
$ob->init(); //Fails sometimes!!! $ob->init(); //Fails sometimes!!!
} }
} }
$this->loadAPI("plugin", "PluginAPI"); //fix :(
$this->plugin->init();
$this->server->loadEntities(); $this->server->loadEntities();
} }
@ -262,6 +265,7 @@ class ServerAPI{
} }
private function parseProperties(){ private function parseProperties(){
$this->config = new Config(FILE_PATH."white-list.txt");
$prop = file_get_contents(FILE_PATH."server.properties"); $prop = file_get_contents(FILE_PATH."server.properties");
$prop = explode("\n", str_replace("\r", "", $prop)); $prop = explode("\n", str_replace("\r", "", $prop));
$this->config = array(); $this->config = array();