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

Introduce EntityFactory

Browse Source 
This contains all of the static stuff that was previously embedded in the Entity static root. This solves a bunch of problems like circular dependencies between parent and child classes, encapsulating logic and reducing the size of the enormous Entity.php.
This commit is contained in:
Dylan K. Taylor
2019-01-06 23:54:29 +00:00
parent b1cef8509a
commit 7d827a1c65
13 changed files with 298 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/block/Fallable.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\entity\Entity;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\object\FallingBlock;
use pocketmine\math\Facing;
@ -34,12 +34,12 @@ abstract class Fallable extends Solid{
if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
$this->level->setBlock($this, BlockFactory::get(Block::AIR));
$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
$nbt = EntityFactory::createBaseNBT($this->add(0.5, 0, 0.5));
$nbt->setInt("TileID", $this->getId());
$nbt->setByte("Data", $this->getDamage());
/** @var FallingBlock $fall */
$fall = Entity::create(FallingBlock::class, $this->getLevel(), $nbt);
$fall = EntityFactory::create(FallingBlock::class, $this->getLevel(), $nbt);
$fall->spawnToAll();
}
}

5
src/pocketmine/block/TNT.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\entity\Entity;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\object\PrimedTNT;
use pocketmine\entity\projectile\Arrow;
use pocketmine\item\FlintSteel;
@ -75,11 +76,11 @@ class TNT extends Solid{
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR));
$mot = (new Random())->nextSignedFloat() * M_PI * 2;
$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5), new Vector3(-sin($mot) * 0.02, 0.2, -cos($mot) * 0.02));
$nbt = EntityFactory::createBaseNBT($this->add(0.5, 0, 0.5), new Vector3(-sin($mot) * 0.02, 0.2, -cos($mot) * 0.02));
$nbt->setShort("Fuse", $fuse);
/** @var PrimedTNT $tnt */
$tnt = Entity::create(PrimedTNT::class, $this->getLevel(), $nbt);
$tnt = EntityFactory::create(PrimedTNT::class, $this->getLevel(), $nbt);
$tnt->spawnToAll();
}