From d0d300a6f84e2d72c32bccd9027195cd1218e01f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 12 Apr 2019 18:32:15 +0100 Subject: [PATCH 1/3] backport 342b48b75: VersionString: Use the correct bitwise operators --- src/pocketmine/utils/VersionString.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/utils/VersionString.php b/src/pocketmine/utils/VersionString.php index dd01356d0d..e9a5f3c60b 100644 --- a/src/pocketmine/utils/VersionString.php +++ b/src/pocketmine/utils/VersionString.php @@ -70,7 +70,7 @@ class VersionString{ } public function getNumber() : int{ - return (($this->major << 9) + ($this->minor << 5) + $this->patch); + return (($this->major << 9) | ($this->minor << 5) | $this->patch); } public function getBaseVersion() : string{ From 82e4ef6d4867c610b0e871c246333576630063f0 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 27 Mar 2019 15:39:06 +0000 Subject: [PATCH 2/3] backport d8c81c0a1: UUID: remove useless default values these are overwritten by the constructor, so they have no use here. --- src/pocketmine/utils/UUID.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/utils/UUID.php b/src/pocketmine/utils/UUID.php index 0c21d8a7b8..b645000d15 100644 --- a/src/pocketmine/utils/UUID.php +++ b/src/pocketmine/utils/UUID.php @@ -38,8 +38,8 @@ use function trim; class UUID{ - private $parts = [0, 0, 0, 0]; - private $version = null; + private $parts; + private $version; public function __construct(int $part1 = 0, int $part2 = 0, int $part3 = 0, int $part4 = 0, int $version = null){ $this->parts = [$part1, $part2, $part3, $part4]; From dbf4054b1fb2f01b1bc644747c94226a33012490 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 27 Mar 2019 15:39:41 +0000 Subject: [PATCH 3/3] backport 209135492: UUID: add type docs --- src/pocketmine/utils/UUID.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pocketmine/utils/UUID.php b/src/pocketmine/utils/UUID.php index b645000d15..21432ad1f3 100644 --- a/src/pocketmine/utils/UUID.php +++ b/src/pocketmine/utils/UUID.php @@ -38,7 +38,9 @@ use function trim; class UUID{ + /** @var int[] */ private $parts; + /** @var int */ private $version; public function __construct(int $part1 = 0, int $part2 = 0, int $part3 = 0, int $part4 = 0, int $version = null){