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

WaterCauldron: reduce code repetition

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-05-19 15:40:04 +01:00
parent b8a1b32461
commit 4a3843a881
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/block/WaterCauldron.php
View File

@ -108,14 +108,14 @@ final class WaterCauldron extends FillableCauldron{
} }
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
if(($newColor = match($item->getTypeId()){ if(($dyeColor = match($item->getTypeId()){
ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE()->getRgbValue(), ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE(),
ItemTypeIds::INK_SAC => DyeColor::BLACK()->getRgbValue(), ItemTypeIds::INK_SAC => DyeColor::BLACK(),
ItemTypeIds::COCOA_BEANS => DyeColor::BROWN()->getRgbValue(), ItemTypeIds::COCOA_BEANS => DyeColor::BROWN(),
ItemTypeIds::BONE_MEAL => DyeColor::WHITE()->getRgbValue(), ItemTypeIds::BONE_MEAL => DyeColor::WHITE(),
ItemTypeIds::DYE => $item instanceof Dye ? $item->getColor()->getRgbValue() : null, ItemTypeIds::DYE => $item instanceof Dye ? $item->getColor() : null,
default => null default => null
}) !== null && $newColor->toRGBA() !== $this->customWaterColor?->toRGBA() }) !== null && ($newColor = $dyeColor->getRgbValue())->toRGBA() !== $this->customWaterColor?->toRGBA()
){ ){
$this->position->getWorld()->setBlock($this->position, $this->setCustomWaterColor($this->customWaterColor === null ? $newColor : Color::mix($this->customWaterColor, $newColor))); $this->position->getWorld()->setBlock($this->position, $this->setCustomWaterColor($this->customWaterColor === null ? $newColor : Color::mix($this->customWaterColor, $newColor)));
$this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronAddDyeSound()); $this->position->getWorld()->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronAddDyeSound());