From 24ed823d96f881fd9482aea223544b3de33d2ecd Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 22 Jan 2020 14:51:14 +0000 Subject: [PATCH 1/4] WritableBook: remove extra line from phpdoc on setPages() --- src/pocketmine/item/WritableBook.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pocketmine/item/WritableBook.php b/src/pocketmine/item/WritableBook.php index eaefac5d7..25585040d 100644 --- a/src/pocketmine/item/WritableBook.php +++ b/src/pocketmine/item/WritableBook.php @@ -180,7 +180,6 @@ class WritableBook extends Item{ } /** - * * @param CompoundTag[] $pages */ public function setPages(array $pages) : void{ From f6611a38bc35c41f292e9da7da2b5140cc0e4495 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 22 Jan 2020 14:51:49 +0000 Subject: [PATCH 2/4] Explosion: fix trailing whitespace in explodeA() phpdoc --- src/pocketmine/level/Explosion.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index 4ea9c5280..08b049661 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -86,7 +86,7 @@ class Explosion{ } /** - * Calculates which blocks will be destroyed by this explosion. If explodeB() is called without calling this, no blocks + * Calculates which blocks will be destroyed by this explosion. If explodeB() is called without calling this, no blocks * will be destroyed. */ public function explodeA() : bool{ From b8d44ff162dc0d4f6f35b10251ac87eafba406ff Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 22 Jan 2020 14:58:00 +0000 Subject: [PATCH 3/4] SkinImage: fix formatting error --- src/pocketmine/network/mcpe/protocol/types/SkinImage.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php index fcb0c966f..97b9f87d7 100644 --- a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php +++ b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types; + use function strlen; class SkinImage{ From 8184a6b114fda9281e8da2330d5f5aa7fcb44d0f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 22 Jan 2020 14:58:36 +0000 Subject: [PATCH 4/4] SkinImage: enforce that height/width must be positive --- src/pocketmine/network/mcpe/protocol/types/SkinImage.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php index 97b9f87d7..bee563295 100644 --- a/src/pocketmine/network/mcpe/protocol/types/SkinImage.php +++ b/src/pocketmine/network/mcpe/protocol/types/SkinImage.php @@ -35,6 +35,9 @@ class SkinImage{ private $data; public function __construct(int $height, int $width, string $data){ + if($height < 0 or $width < 0){ + throw new \InvalidArgumentException("Height and width cannot be negative"); + } if(($expected = $height * $width * 4) !== ($actual = strlen($data))){ throw new \InvalidArgumentException("Data should be exactly $expected bytes, got $actual bytes"); }