From e69cd95027e9e1964923a8dd26bb75b4ac848193 Mon Sep 17 00:00:00 2001
From: xenial <xenial@localhost.localdomain>
Date: Sun, 13 Dec 2020 02:28:54 +0100
Subject: [PATCH] Fix \Generator returns/params

---
 src/xenialdan/MagicWE2/clipboard/RevertClipboard.php | 11 +++++++++--
 src/xenialdan/MagicWE2/task/AsyncFillTask.php        |  1 +
 src/xenialdan/MagicWE2/task/AsyncPasteTask.php       |  1 +
 src/xenialdan/MagicWE2/task/AsyncReplaceTask.php     |  1 +
 src/xenialdan/MagicWE2/task/AsyncRevertTask.php      |  6 ++++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/xenialdan/MagicWE2/clipboard/RevertClipboard.php b/src/xenialdan/MagicWE2/clipboard/RevertClipboard.php
index 8dbd369d..9cd4abcf 100644
--- a/src/xenialdan/MagicWE2/clipboard/RevertClipboard.php
+++ b/src/xenialdan/MagicWE2/clipboard/RevertClipboard.php
@@ -10,9 +10,15 @@
 
 class RevertClipboard extends Clipboard
 {
-	/** @var Chunk[] */
+	/**
+	 * @var Chunk[]
+	 * @phpstan-var array<int, Chunk>
+	 */
 	public $chunks = [];
-	/** @var array[] */
+	/**
+	 * @var array[]
+	 * @phpstan-var array<array{int, Position|null}>
+	 */
 	public $blocksAfter;
 
 	/**
@@ -20,6 +26,7 @@ class RevertClipboard extends Clipboard
 	 * @param int $worldId
 	 * @param Chunk[] $chunks
 	 * @param array[] $blocksAfter //CHANGED AS HACK
+	 * @phpstan-param array<array{int, Position|null}> $blocksAfter
 	 */
 	public function __construct(int $worldId, array $chunks = [], array $blocksAfter = [])
 	{
diff --git a/src/xenialdan/MagicWE2/task/AsyncFillTask.php b/src/xenialdan/MagicWE2/task/AsyncFillTask.php
index 0d5f3206..33777cc4 100644
--- a/src/xenialdan/MagicWE2/task/AsyncFillTask.php
+++ b/src/xenialdan/MagicWE2/task/AsyncFillTask.php
@@ -9,6 +9,7 @@
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat as TF;
 use pocketmine\uuid\UUID;
+use pocketmine\world\Position;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
 use xenialdan\MagicWE2\API;
diff --git a/src/xenialdan/MagicWE2/task/AsyncPasteTask.php b/src/xenialdan/MagicWE2/task/AsyncPasteTask.php
index e0e95b8e..9848cba3 100644
--- a/src/xenialdan/MagicWE2/task/AsyncPasteTask.php
+++ b/src/xenialdan/MagicWE2/task/AsyncPasteTask.php
@@ -10,6 +10,7 @@
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat as TF;
 use pocketmine\uuid\UUID;
+use pocketmine\world\Position;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
 use xenialdan\MagicWE2\API;
diff --git a/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php b/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php
index ebfbb7ac..e700f7a9 100644
--- a/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php
+++ b/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php
@@ -9,6 +9,7 @@
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat as TF;
 use pocketmine\uuid\UUID;
+use pocketmine\world\Position;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
 use xenialdan\MagicWE2\API;
diff --git a/src/xenialdan/MagicWE2/task/AsyncRevertTask.php b/src/xenialdan/MagicWE2/task/AsyncRevertTask.php
index e330a8e4..c7221071 100644
--- a/src/xenialdan/MagicWE2/task/AsyncRevertTask.php
+++ b/src/xenialdan/MagicWE2/task/AsyncRevertTask.php
@@ -66,7 +66,8 @@ public function onRun(): void
 	/**
 	 * @param AsyncChunkManager $manager
 	 * @param RevertClipboard $clipboard
-	 * @return Generator|Block[]
+	 * @return Generator|array[]
+	 * @phpstan-return Generator<int, array{int, Position|null}, void, void>
 	 * @throws InvalidArgumentException
 	 */
 	private function undoChunks(AsyncChunkManager $manager, RevertClipboard $clipboard): Generator
@@ -87,7 +88,8 @@ private function undoChunks(AsyncChunkManager $manager, RevertClipboard $clipboa
 	/**
 	 * @param AsyncChunkManager $manager
 	 * @param RevertClipboard $clipboard
-	 * @return Generator|Block[]
+	 * @return Generator|array[]
+	 * @phpstan-return Generator<int, array{int, Position|null}, void, void>
 	 * @throws InvalidArgumentException
 	 */
 	private function redoChunks(AsyncChunkManager $manager, RevertClipboard $clipboard): Generator