Try applying fix for array_rand & remove obsolete count()===0 checks

DHJwastaken · Jan 26, 2020 · f102ddd · f102ddd
1 parent eb6416e
commit f102ddd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/src/xenialdan/MagicWE2/task/AsyncFillTask.php b/src/xenialdan/MagicWE2/task/AsyncFillTask.php
@@ -111,10 +111,7 @@ private function execute(Selection $selection, AsyncChunkManager $manager, array
                 }
             }
             /** @var Block $new */
-            if (count($newBlocks) === 1)
-                $new = clone $newBlocks[0];
-            else
-                $new = clone $newBlocks[(int)array_rand($newBlocks, 1)];
+            $new = clone $newBlocks[array_rand($newBlocks)];
             if ($new->getId() === $block->getId() && $new->getDamage() === $block->getDamage()) continue;//skip same blocks
             yield $manager->getBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ())->setComponents($block->x, $block->y, $block->z);
             $manager->setBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ(), $new);

diff --git a/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php b/src/xenialdan/MagicWE2/task/AsyncReplaceTask.php
@@ -115,10 +115,7 @@ private function execute(Selection $selection, AsyncChunkManager $manager, array
                 }
             }
             /** @var Block $new */
-            if (count($newBlocks) === 1)
-                $new = clone $newBlocks[0];
-            else
-                $new = clone $newBlocks[(int)array_rand($newBlocks, 1)];
+            $new = clone $newBlocks[array_rand($newBlocks)];
             if ($new->getId() === $block->getId() && $new->getDamage() === $block->getDamage()) continue;//skip same blocks
             yield $manager->getBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ())->setComponents($block->x, $block->y, $block->z);
             $manager->setBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ(), $new);

diff --git a/src/xenialdan/MagicWE2/task/action/SetBlockAction.php b/src/xenialdan/MagicWE2/task/action/SetBlockAction.php
@@ -44,10 +44,7 @@ public function execute(string $sessionUUID, Selection $selection, AsyncChunkMan
         $lastProgress = new Progress(0, "");
         foreach ($selection->getShape()->getBlocks($manager, $blockFilter) as $block) {
             /** @var Block $new */
-            if (count($newBlocks) === 1)
-                $new = clone $newBlocks[0];
-            else
-                $new = clone $newBlocks[(int)array_rand($newBlocks, 1)];
+            $new = clone $newBlocks[array_rand($newBlocks)];
             if ($new->getId() === $block->getId() && $new->getDamage() === $block->getDamage()) continue;//skip same blocks
             $oldBlocks[] = $manager->getBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ())->setComponents($block->x, $block->y, $block->z);
             $manager->setBlockAt($block->getFloorX(), $block->getFloorY(), $block->getFloorZ(), $new);

diff --git a/src/xenialdan/MagicWE2/tool/Flood.php b/src/xenialdan/MagicWE2/tool/Flood.php
@@ -103,7 +103,7 @@ private function getHorizontalSides($manager, Vector3 $vector3): Generator
         foreach ([Vector3::SIDE_NORTH, Vector3::SIDE_SOUTH, Vector3::SIDE_WEST, Vector3::SIDE_EAST] as $vSide) {
             $side = $vector3->getSide($vSide);
             if ($manager->getChunk($side->x >> 4, $side->z >> 4) === null) continue;
-            $block = $manager->getBlockAt($side->x, $side->y, $side->z);
+            $block = $manager->getBlockAt($side->getFloorX(), $side->getFloorY(), $side->getFloorZ());
             $block->setComponents($side->x, $side->y, $side->z);
             yield $block;
         }