Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Commit bed10ad

Browse files
committed
Fix bugs
1 parent c88e14a commit bed10ad

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,58 +31,55 @@ public function event(BlockBreakEvent $event): void
3131
case Block::WOOD:
3232
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
3333
$event->setCancelled();
34+
return;
3435
}
3536
$inventory->addItem(Item::get(Item::WOODEN_PLANKS, 0, 4));
3637
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::WOOD), 15 * 20);
3738
break;
3839
case Block::DIAMOND_ORE:
3940
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
4041
$event->setCancelled();
41-
}
42-
if (TieredTool::TIER_IRON >= $inventory->getItemInHand()->getBlockToolHarvestLevel()) {
43-
$event->setCancelled();
42+
return;
4443
}
4544
$inventory->addItem(Item::get(Item::DIAMOND));
4645
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::DIAMOND_ORE), 60 * 20);
4746
break;
4847
case Block::EMERALD_ORE:
4948
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
5049
$event->setCancelled();
51-
}
52-
if (TieredTool::TIER_IRON >= $inventory->getItemInHand()->getBlockToolHarvestLevel()) {
53-
$event->setCancelled();
50+
return;
5451
}
5552
$inventory->addItem(Item::get(Item::EMERALD, 0, mt_rand(1, 3)));
5653
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::EMERALD_ORE), 60 * 20);
5754
break;
5855
case Block::COAL_ORE:
5956
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
6057
$event->setCancelled();
61-
}
62-
if (TieredTool::TIER_WOODEN >= $inventory->getItemInHand()->getBlockToolHarvestLevel()) {
63-
$event->setCancelled();
58+
return;
6459
}
6560
$inventory->addItem(Item::get(Item::COAL));
6661
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::COAL_ORE), 15 * 20);
6762
break;
6863
case Block::IRON_ORE:
6964
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
7065
$event->setCancelled();
71-
}
72-
if (TieredTool::TIER_STONE >= $inventory->getItemInHand()->getBlockToolHarvestLevel()) {
73-
$event->setCancelled();
66+
return;
7467
}
7568
$inventory->addItem(Item::get(Item::IRON_INGOT));
7669
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::IRON_ORE), 20 * 20);
7770
break;
7871
case Block::GOLD_ORE:
79-
72+
if ($block->getToolType() !== $inventory->getItemInHand()->getBlockToolType()) {
73+
$event->setCancelled();
74+
return;
75+
}
8076
$inventory->addItem(Item::get(Item::GOLD_INGOT));
8177
TheMix::getInstance()->getScheduler()->scheduleDelayedTask(new BlockReGeneratorTask($block, Block::GOLD_ORE), 30 * 20);
8278
break;
8379
default:
84-
if ($event->getPlayer()->getLevel()->getName() === DefaultConfig::getStageLevelName() && DefaultConfig::isDev() === false) {
80+
if ($event->getPlayer()->getLevel()->getName() === DefaultConfig::getStageLevelName() && DefaultConfig::isDev() === true) {
8581
$event->setCancelled();
82+
return;
8683
}
8784
}
8885
}

0 commit comments

Comments
 (0)