mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-07 10:31:51 +00:00
Code Issues Projects Releases Wiki Activity

Fixed Container::check() blacklist

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-23 18:21:37 +02:00
parent 13aa73d26e
commit fea6e9c432
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/ChatAPI.php
View File

@ -115,7 +115,7 @@ class ChatAPI{
} }
} }
$message .= $text; $message .= $text;
if($whitelist === false and $blacklist === false){ if($whitelist === false){
console("[INFO] ".$message); console("[INFO] ".$message);
} }
$this->server->handle("server.chat", new Container($message, $whitelist, $blacklist)); $this->server->handle("server.chat", new Container($message, $whitelist, $blacklist));

4
src/network/RCON.php
View File

@ -31,7 +31,7 @@ Source: https://developer.valvesoftware.com/wiki/Source_RCON_Protocol
*/ */
class RCON{ 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){ public function __construct($password, $port = 19132, $interface = "0.0.0.0", $threads = 1, $clientsPerThread = 50){
$this->workers = array(); $this->workers = array();
@ -90,7 +90,6 @@ class RCONInstance extends Thread{
public $response; public $response;
private $socket; private $socket;
private $password; private $password;
private $status;
private $maxClients; private $maxClients;
public function __construct($socket, $password, $maxClients = 50){ public function __construct($socket, $password, $maxClients = 50){
@ -105,7 +104,6 @@ class RCONInstance extends Thread{
$this->{"status".$n} = 0; $this->{"status".$n} = 0;
$this->{"timeout".$n} = 0; $this->{"timeout".$n} = 0;
} }
$this->status = array();
$this->start(); $this->start();
} }

4
src/utils/Container.php
View File

@ -53,9 +53,9 @@ class Container{
$w = true; $w = true;
} }
if($this->blacklist !== false){ if($this->blacklist !== false){
$b = true;
if(in_array($target, $this->blacklist, true)){
$b = false; $b = false;
if(in_array($target, $this->blacklist, true)){
$b = true;
} }
}else{ }else{
$b = false; $b = false;