diff --git a/src/API/ChatAPI.php b/src/API/ChatAPI.php index 7d1b20653..d4e7df553 100644 --- a/src/API/ChatAPI.php +++ b/src/API/ChatAPI.php @@ -115,7 +115,7 @@ class ChatAPI{ } } $message .= $text; - if($whitelist === false and $blacklist === false){ + if($whitelist === false){ console("[INFO] ".$message); } $this->server->handle("server.chat", new Container($message, $whitelist, $blacklist)); diff --git a/src/network/RCON.php b/src/network/RCON.php index ab9629df1..b2313b0b8 100644 --- a/src/network/RCON.php +++ b/src/network/RCON.php @@ -31,7 +31,7 @@ Source: https://developer.valvesoftware.com/wiki/Source_RCON_Protocol */ class RCON{ - private $socket, $password, $workers, $threads; + private $socket, $password, $workers, $threads, $clientsPerThread; public function __construct($password, $port = 19132, $interface = "0.0.0.0", $threads = 1, $clientsPerThread = 50){ $this->workers = array(); @@ -90,7 +90,6 @@ class RCONInstance extends Thread{ public $response; private $socket; private $password; - private $status; private $maxClients; public function __construct($socket, $password, $maxClients = 50){ @@ -105,7 +104,6 @@ class RCONInstance extends Thread{ $this->{"status".$n} = 0; $this->{"timeout".$n} = 0; } - $this->status = array(); $this->start(); } diff --git a/src/utils/Container.php b/src/utils/Container.php index d3ae5fbba..17602052b 100644 --- a/src/utils/Container.php +++ b/src/utils/Container.php @@ -53,9 +53,9 @@ class Container{ $w = true; } if($this->blacklist !== false){ - $b = true; + $b = false; if(in_array($target, $this->blacklist, true)){ - $b = false; + $b = true; } }else{ $b = false;