mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-05 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Changed block construction calls to Block::get()

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-19 13:46:17 +01:00
parent 276fccf4bb
commit 0e24596aed
22 changed files with 50 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/pocketmine/level/generator/Flat.php
View File

@ -23,17 +23,11 @@ declare(strict_types=1);
namespace pocketmine\level\generator;
use pocketmine\block\CoalOre;
use pocketmine\block\DiamondOre;
use pocketmine\block\Dirt;
use pocketmine\block\GoldOre;
use pocketmine\block\Gravel;
use pocketmine\block\IronOre;
use pocketmine\block\LapisOre;
use pocketmine\block\RedstoneOre;
use pocketmine\block\Block;
use pocketmine\item\Item;
use pocketmine\level\ChunkManager;
use pocketmine\level\format\Chunk;
use pocketmine\level\generator\object\OreType;
use pocketmine\level\generator\populator\Ore;
use pocketmine\level\generator\populator\Populator;
use pocketmine\math\Vector3;
@ -67,14 +61,14 @@ class Flat extends Generator{
if(isset($this->options["decoration"])){
$ores = new Ore();
$ores->setOreTypes([
new object\OreType(new CoalOre(), 20, 16, 0, 128),
new object\OreType(new IronOre(), 20, 8, 0, 64),
new object\OreType(new RedstoneOre(), 8, 7, 0, 16),
new object\OreType(new LapisOre(), 1, 6, 0, 32),
new object\OreType(new GoldOre(), 2, 8, 0, 32),
new object\OreType(new DiamondOre(), 1, 7, 0, 16),
new object\OreType(new Dirt(), 20, 32, 0, 128),
new object\OreType(new Gravel(), 10, 16, 0, 128)
new OreType(Block::get(Block::COAL_ORE), 20, 16, 0, 128),
new OreType(Block::get(Block::IRON_ORE), 20, 8, 0, 64),
new OreType(Block::get(Block::REDSTONE_ORE), 8, 7, 0, 16),
new OreType(Block::get(Block::LAPIS_ORE), 1, 6, 0, 32),
new OreType(Block::get(Block::GOLD_ORE), 2, 8, 0, 32),
new OreType(Block::get(Block::DIAMOND_ORE), 1, 7, 0, 16),
new OreType(Block::get(Block::DIRT), 20, 32, 0, 128),
new OreType(Block::get(Block::GRAVEL), 10, 16, 0, 128)
]);
$this->populators[] = $ores;
}

24
src/pocketmine/level/generator/normal/Normal.php
View File

@ -24,14 +24,6 @@ declare(strict_types=1);
namespace pocketmine\level\generator\normal;
use pocketmine\block\Block;
use pocketmine\block\CoalOre;
use pocketmine\block\DiamondOre;
use pocketmine\block\Dirt;
use pocketmine\block\GoldOre;
use pocketmine\block\Gravel;
use pocketmine\block\IronOre;
use pocketmine\block\LapisOre;
use pocketmine\block\RedstoneOre;
use pocketmine\level\ChunkManager;
use pocketmine\level\generator\biome\Biome;
use pocketmine\level\generator\biome\BiomeSelector;
@ -179,14 +171,14 @@ class Normal extends Generator{
$ores = new Ore();
$ores->setOreTypes([
new OreType(new CoalOre(), 20, 16, 0, 128),
new OreType(New IronOre(), 20, 8, 0, 64),
new OreType(new RedstoneOre(), 8, 7, 0, 16),
new OreType(new LapisOre(), 1, 6, 0, 32),
new OreType(new GoldOre(), 2, 8, 0, 32),
new OreType(new DiamondOre(), 1, 7, 0, 16),
new OreType(new Dirt(), 20, 32, 0, 128),
new OreType(new Gravel(), 10, 16, 0, 128)
new OreType(Block::get(Block::COAL_ORE), 20, 16, 0, 128),
new OreType(Block::get(Block::IRON_ORE), 20, 8, 0, 64),
new OreType(Block::get(Block::REDSTONE_ORE), 8, 7, 0, 16),
new OreType(Block::get(Block::LAPIS_ORE), 1, 6, 0, 32),
new OreType(Block::get(Block::GOLD_ORE), 2, 8, 0, 32),
new OreType(Block::get(Block::DIAMOND_ORE), 1, 7, 0, 16),
new OreType(Block::get(Block::DIRT), 20, 32, 0, 128),
new OreType(Block::get(Block::GRAVEL), 10, 16, 0, 128)
]);
$this->populators[] = $ores;
}

3
src/pocketmine/level/generator/populator/Pond.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\level\generator\populator;
use pocketmine\block\Block;
use pocketmine\block\Water;
use pocketmine\level\ChunkManager;
use pocketmine\math\Vector3;
@ -38,7 +39,7 @@ class Pond extends Populator{
$x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 16);
$y = $random->nextBoundedInt(128);
$z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 16);
$pond = new \pocketmine\level\generator\object\Pond($random, new Water());
$pond = new \pocketmine\level\generator\object\Pond($random, Block::get(Block::WATER));
if($pond->canPlaceObject($level, $v = new Vector3($x, $y, $z))){
$pond->placeObject($level, $v);
}