Fixed genisys getServerName issue and minor bug fixes in setup.

Patra3 · Sep 26, 2016 · fbe8c96 · fbe8c96
1 parent f381723
commit fbe8c96
Show file tree

Hide file tree

Showing 34 changed files with 15 additions and 2 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/glifcos-plugin/Glifcos_v2.0.0-b1.phar b/glifcos-plugin/Glifcos_v2.0.0-b1.phar
diff --git a/glifcos-plugin/Glifcos_v2.0.0-b2.phar b/glifcos-plugin/Glifcos_v2.0.0-b2.phar
diff --git a/glifcos-plugin/plugin.yml b/glifcos-plugin/plugin.yml
@@ -1,6 +1,6 @@
 name: Glifcos
 main: Glifcos\Glifcos
-version: 2.0.0-b1
+version: 2.0.0-b2
 api: 2.0.0
 author: HotFireyDeath/Chopstick Software
 

diff --git a/glifcos-plugin/src/Glifcos/Glifcos.php b/glifcos-plugin/src/Glifcos/Glifcos.php
@@ -30,6 +30,10 @@ public function onEnable(){
         }
         if (is_file($this->getDataFolder()."/data.txt")){
             $this->webserver = base64_decode(file_get_contents($this->getDataFolder()."/data.txt"));
+            $this->getLogger()->info(TextFormat::GREEN."Glifcos webserver located.");
+        }
+        else{
+            $this->getLogger()->info(TextFormat::YELLOW."Glifcos setup not complete. Please complete your setup or else some services will fail.");
         }
         $this->filemgr_currentpath = "/";
         $this->pingGlifcos();
@@ -54,7 +58,7 @@ public function pingGlifcos(){
             "version" => $this->getServer()->getPocketMineVersion(),
             "codename" => $this->getServer()->getCodename(),
             "maxplayers" => $this->getServer()->getMaxPlayers(),
-            "name" => $this->getServer()->getServerName(),
+            "name" => "Minecraft PE Server",
             "motd" => $this->getServer()->getMotd()
         ));
     }

diff --git a/glifcos-plugin/src/Glifcos/tasks/AsyncDataSender.php b/glifcos-plugin/src/Glifcos/tasks/AsyncDataSender.php
diff --git a/glifcos-plugin/src/Glifcos/tasks/ConsoleBroadcastTask.php b/glifcos-plugin/src/Glifcos/tasks/ConsoleBroadcastTask.php
diff --git a/glifcos-plugin/src/Glifcos/tasks/ConsoleCommandTask.php b/glifcos-plugin/src/Glifcos/tasks/ConsoleCommandTask.php
@@ -15,8 +15,14 @@ public function __construct($plugin){
     }
     public function onRun($ticks){
         // manipulate webserver to get the command data file.
+        if (empty($this->plugin->webserver)){
+            return;
+        }
         $webserver = str_replace("server.php", "database/commands.txt", $this->plugin->webserver);
         $content = file_get_contents($webserver);
+        if (empty($content)){
+            return;
+        }
         $content = base64_decode($content);
         $content = json_decode($content);
         foreach($content as $command){

diff --git a/glifcos-plugin/src/Glifcos/tasks/FileBroadcastTask.php b/glifcos-plugin/src/Glifcos/tasks/FileBroadcastTask.php
@@ -13,6 +13,9 @@ public function __construct($plugin){
         parent::__construct($plugin);
     }
     public function onRun($ticks){
+        if (empty($this->plugin->webserver)){
+            return;
+        }
         $this->plugin->filemgr_currentpath = base64_decode(file_get_contents(str_replace("server.php", "database/FILE_POINTER_PATH.txt", $this->plugin->webserver)));
         if (is_file($this->plugin->getServer()->getDataPath().$this->plugin->filemgr_currentpath)){
             $this->plugin->sendData(array(

diff --git a/glifcos-plugin/src/Glifcos/tasks/PlayerBroadcastTask.php b/glifcos-plugin/src/Glifcos/tasks/PlayerBroadcastTask.php
diff --git a/glifcos-plugin/src/Glifcos/tasks/PluginBroadcastTask.php b/glifcos-plugin/src/Glifcos/tasks/PluginBroadcastTask.php
diff --git a/glifcos-plugin/src/Glifcos/tasks/RamBroadcastTask.php b/glifcos-plugin/src/Glifcos/tasks/RamBroadcastTask.php
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.css b/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.css
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.css.map b/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.css.map
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.min.css b/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.min.css
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.min.css.map b/glifcos-webserver/assets/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap.css b/glifcos-webserver/assets/bootstrap/css/bootstrap.css
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap.css.map b/glifcos-webserver/assets/bootstrap/css/bootstrap.css.map
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap.min.css b/glifcos-webserver/assets/bootstrap/css/bootstrap.min.css
diff --git a/glifcos-webserver/assets/bootstrap/css/bootstrap.min.css.map b/glifcos-webserver/assets/bootstrap/css/bootstrap.min.css.map
diff --git a/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.eot b/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.svg b/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.ttf b/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.woff b/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/glifcos-webserver/assets/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/glifcos-webserver/assets/bootstrap/js/bootstrap.js b/glifcos-webserver/assets/bootstrap/js/bootstrap.js
diff --git a/glifcos-webserver/assets/bootstrap/js/bootstrap.min.js b/glifcos-webserver/assets/bootstrap/js/bootstrap.min.js
diff --git a/glifcos-webserver/assets/bootstrap/js/npm.js b/glifcos-webserver/assets/bootstrap/js/npm.js
diff --git a/glifcos-webserver/assets/jquery/jquery.js b/glifcos-webserver/assets/jquery/jquery.js
diff --git a/glifcos-webserver/assets/jstorage/jstorage.js b/glifcos-webserver/assets/jstorage/jstorage.js
diff --git a/glifcos-webserver/index.html b/glifcos-webserver/index.html
diff --git a/glifcos-webserver/main.html b/glifcos-webserver/main.html
diff --git a/glifcos-webserver/server.php b/glifcos-webserver/server.php