mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 04:15:04 +00:00
Code Issues Projects Releases Wiki Activity

Convert BlockFactory to singleton

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-23 23:45:13 +01:00
parent accc0da0cb
commit 13d784cd0c
24 changed files with 1121 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

878
src/block/BlockFactory.php
View File

File diff suppressed because it is too large Load Diff

2
src/block/ConcretePowder.php
View File

@@ -54,7 +54,7 @@ class ConcretePowder extends Opaque implements Fallable{
continue;
}
if($this->getSide($i) instanceof Water){
return BlockFactory::get(BlockLegacyIds::CONCRETE, $this->idInfo->getVariant());
return BlockFactory::getInstance()->get(BlockLegacyIds::CONCRETE, $this->idInfo->getVariant());
}
}

1263
src/block/VanillaBlocks.php
View File

File diff suppressed because it is too large Load Diff

2
src/block/tile/FlowerPot.php
View File

@@ -44,7 +44,7 @@ class FlowerPot extends Spawnable{
public function readSaveData(CompoundTag $nbt) : void{
if($nbt->hasTag(self::TAG_ITEM, ShortTag::class) and $nbt->hasTag(self::TAG_ITEM_DATA, IntTag::class)){
try{
$this->setPlant(BlockFactory::get($nbt->getShort(self::TAG_ITEM), $nbt->getInt(self::TAG_ITEM_DATA)));
$this->setPlant(BlockFactory::getInstance()->get($nbt->getShort(self::TAG_ITEM), $nbt->getInt(self::TAG_ITEM_DATA)));
}catch(\InvalidArgumentException $e){
//noop
}