Fix

Author: InkoHX

src/VectorNetworkProject/TheMix/event/block/BlockReGeneratorEvent.php

@@ -12,7 +12,6 @@
 use pocketmine\event\block\BlockBreakEvent;
 use pocketmine\event\Listener;
 use pocketmine\item\Item;
-use pocketmine\item\TieredTool;
 use VectorNetworkProject\TheMix\game\DefaultConfig;
 use VectorNetworkProject\TheMix\task\BlockReGeneratorTask;
 use VectorNetworkProject\TheMix\TheMix;
@@ -23,58 +22,59 @@ public function event(BlockBreakEvent $event): void
     {
         $block = $event->getBlock();
         $inventory = $event->getPlayer()->getInventory();
+        if (DefaultConfig::isDev() || $block->getLevel()->getName() !== DefaultConfig::getStageLevelName()) return;
         switch ($block->getId()) {
             case Block::MELON_BLOCK:
                 $inventory->addItem(Item::get(Item::MELON, 0, 16));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::MELON_BLOCK), 10 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 10 * 20);
                 break;
             case Block::WOOD:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::WOODEN_PLANKS, 0, 4));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::WOOD), 15 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 15 * 20);
                 break;
             case Block::DIAMOND_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::DIAMOND));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::DIAMOND_ORE), 60 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 60 * 20);
                 break;
             case Block::EMERALD_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::EMERALD, 0, mt_rand(1, 3)));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::EMERALD_ORE), 60 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 60 * 20);
                 break;
             case Block::COAL_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::COAL));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::COAL_ORE), 15 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 15 * 20);
                 break;
             case Block::IRON_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::IRON_INGOT));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::IRON_ORE), 20 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 20 * 20);
                 break;
             case Block::GOLD_ORE:
                 if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
                     $event->setCancelled();
                     return;
                 }
                 $inventory->addItem(Item::get(Item::GOLD_INGOT));
-                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::GOLD_ORE), 30 * 20);
+                TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block), 30 * 20);
                 break;
             default:
                 if ($event->getPlayer()->getLevel()->getName() === DefaultConfig::getStageLevelName() && DefaultConfig::isDev() === false) {

src/VectorNetworkProject/TheMix/task/BlockReGeneratorTask.php

@@ -16,18 +16,14 @@ class BlockReGeneratorTask extends Task
     /** @var Block $block */
     private $block;
 
-    /** @var int $id */
-    private $id;
-
-    public function __construct(Block $block, int $id)
+    public function __construct(Block $block)
     {
         $this->block = $block;
-        $this->id = $id;
     }
 
     public function onRun(int $currentTick)
     {
-        $this->getBlock()->getLevel()->setBlock($this->getBlock()->asVector3(), Block::get($this->id));
+        $this->getBlock()->getLevel()->setBlock($this->getBlock()->asVector3(), $this->block);
     }
 
     /**