mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-24 04:14:07 +00:00
Merge branch '3.5'
This commit is contained in:
commit
b7973ef782
@ -28,7 +28,7 @@ namespace pocketmine;
|
||||
*/
|
||||
abstract class Thread extends \Thread{
|
||||
|
||||
/** @var \ClassLoader */
|
||||
/** @var \ClassLoader|null */
|
||||
protected $classLoader;
|
||||
/** @var string|null */
|
||||
protected $composerAutoloaderPath;
|
||||
|
@ -28,7 +28,7 @@ namespace pocketmine;
|
||||
*/
|
||||
abstract class Worker extends \Worker{
|
||||
|
||||
/** @var \ClassLoader */
|
||||
/** @var \ClassLoader|null */
|
||||
protected $classLoader;
|
||||
/** @var string|null */
|
||||
protected $composerAutoloaderPath;
|
||||
|
@ -40,7 +40,18 @@ use function strlen;
|
||||
use function substr;
|
||||
|
||||
class QueryHandler{
|
||||
private $server, $lastToken, $token, $longData, $shortData, $timeout;
|
||||
/** @var Server */
|
||||
private $server;
|
||||
/** @var string */
|
||||
private $lastToken;
|
||||
/** @var string */
|
||||
private $token;
|
||||
/** @var string */
|
||||
private $longData;
|
||||
/** @var string */
|
||||
private $shortData;
|
||||
/** @var float */
|
||||
private $timeout;
|
||||
|
||||
public const HANDSHAKE = 9;
|
||||
public const STATISTICS = 0;
|
||||
|
@ -30,7 +30,13 @@ use function count;
|
||||
class Color{
|
||||
|
||||
/** @var int */
|
||||
protected $a, $r, $g, $b;
|
||||
protected $a;
|
||||
/** @var int */
|
||||
protected $r;
|
||||
/** @var int */
|
||||
protected $g;
|
||||
/** @var int */
|
||||
protected $b;
|
||||
|
||||
public function __construct(int $r, int $g, int $b, int $a = 0xff){
|
||||
$this->r = $r & 0xff;
|
||||
|
Loading…
x
Reference in New Issue
Block a user