mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 05:55:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-16 14:47:01 +01:00
commit 7b98d203f4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/utils/UUID.php
View File

@ -38,8 +38,10 @@ use function trim;
class UUID{
private $parts = [0, 0, 0, 0];
private $version = null;
/** @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){
$this->parts = [$part1, $part2, $part3, $part4];

2
src/pocketmine/utils/VersionString.php
View File

@ -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{