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

Block: Replace Color and WoodType magic numbers with type-safe objects

Browse Source 
this provides automatic type safety without the need for magic number value checking everywhere.
This commit is contained in:
Dylan K. Taylor
2019-02-12 13:52:59 +00:00
parent 18440f612f
commit 7b3993730a
25 changed files with 422 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/block/Bed.php
View File

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\utils\BlockDataValidator;
use pocketmine\block\utils\Color;
use pocketmine\block\utils\DyeColor;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\lang\TranslationContainer;
@ -52,11 +52,11 @@ class Bed extends Transparent{
protected $occupied = false;
/** @var bool */
protected $head = false;
/** @var int */
protected $color = Color::RED;
/** @var DyeColor */
protected $color;
public function __construct(){
$this->color = DyeColor::$RED;
}
protected function writeStateToMeta() : int{
@ -183,7 +183,7 @@ class Bed extends Transparent{
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
$this->color = $item->getDamage(); //TODO: replace this with a proper colour getter
$this->color = DyeColor::fromMagicNumber($item->getDamage()); //TODO: replace this with a proper colour getter
$down = $this->getSide(Facing::DOWN);
if(!$down->isTransparent()){
$this->facing = $player !== null ? $player->getHorizontalFacing() : Facing::NORTH;
@ -211,7 +211,7 @@ class Bed extends Transparent{
}
public function getItem() : Item{
return ItemFactory::get($this->getItemId(), $this->color);
return ItemFactory::get($this->getItemId(), $this->color->getMagicNumber());
}
public function isAffectedBySilkTouch() : bool{