From dbd0d04549d64e4851466e750b47aa3c34435fd1 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Tue, 5 Feb 2019 13:58:18 +0000
Subject: [PATCH 1/2] fix wrong doc comments in Thread & Worker

---
 src/pocketmine/Thread.php | 2 +-
 src/pocketmine/Worker.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pocketmine/Thread.php b/src/pocketmine/Thread.php
index a3d7f41be9..347ec62bcd 100644
--- a/src/pocketmine/Thread.php
+++ b/src/pocketmine/Thread.php
@@ -28,7 +28,7 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	/** @var \ClassLoader */
+	/** @var \ClassLoader|null */
 	protected $classLoader;
 	/** @var string|null */
 	protected $composerAutoloaderPath;
diff --git a/src/pocketmine/Worker.php b/src/pocketmine/Worker.php
index fffa93248d..f4018ea48f 100644
--- a/src/pocketmine/Worker.php
+++ b/src/pocketmine/Worker.php
@@ -28,7 +28,7 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	/** @var \ClassLoader */
+	/** @var \ClassLoader|null */
 	protected $classLoader;
 	/** @var string|null */
 	protected $composerAutoloaderPath;

From 5da48f429fab3797734029bf4432233124f0bbb1 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Tue, 5 Feb 2019 14:03:27 +0000
Subject: [PATCH 2/2] Fixed some remaining one-line field declarations, added
 type docs

---
 src/pocketmine/network/query/QueryHandler.php | 13 ++++++++++++-
 src/pocketmine/utils/Color.php                |  8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php
index d6356599c5..7dfb7c46a9 100644
--- a/src/pocketmine/network/query/QueryHandler.php
+++ b/src/pocketmine/network/query/QueryHandler.php
@@ -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;
diff --git a/src/pocketmine/utils/Color.php b/src/pocketmine/utils/Color.php
index 69a6ff852f..895ebd59b7 100644
--- a/src/pocketmine/utils/Color.php
+++ b/src/pocketmine/utils/Color.php
@@ -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;