Просмотр исходного кода

Merge pull request #421 from rocco27/master

Some updates
rocco27 7 лет назад
Родитель
Сommit
57570340fd

+ 2 - 2
modules/config_games/server_configs/atlas_win64.xml

@@ -66,7 +66,7 @@
       <desc>Port of remote control.</desc>
     </param>
   </server_params>
-<!--  <pre_start>
+  <pre_start>
     cmd /c AtlasTools\RedisDatabase\redis-server_start.bat
-  </pre_start>-->
+  </pre_start>
 </game_config>

+ 1 - 1
modules/config_games/server_configs/empyriongs_win64.xml

@@ -6,7 +6,7 @@
   <game_name>Empyrion – Galactic Survival</game_name>
   <server_exec_name>EmpyrionDedicated.exe</server_exec_name>
   <cli_template>-batchmode -nographics -logFile Logs/Dedicated.log -dedicated dedicated.yaml</cli_template>
-  <console_log>Logs/Dedicated.log</console_log>
+  <exe_location>DedicatedServer</exe_location>
   <max_user_amount>128</max_user_amount>
   <mods>
     <mod key="empyriongs1">

+ 1 - 1
protocol/TeamSpeak3/Node/Channel.php

@@ -546,7 +546,7 @@ class TeamSpeak3_Node_Channel extends TeamSpeak3_Node_Abstract
    */
   public function getIcon()
   {
-    if($this["channel_maxclients"] != -1 && $this["channel_maxclients"] <= $this["total_clients"])
+    if(!$this["channel_maxclients"] || ($this["channel_maxclients"] != -1 && $this["channel_maxclients"] <= $this["total_clients"]))
     {
       return "channel_full";
     }