From 4a3843a881aa0a3c29bf3d522437b3b2cfeacc16 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Fri, 19 May 2023 15:40:04 +0100
Subject: [PATCH] WaterCauldron: reduce code repetition

---
 src/block/WaterCauldron.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/block/WaterCauldron.php b/src/block/WaterCauldron.php
index fddccf43b..276b309ca 100644
--- a/src/block/WaterCauldron.php
+++ b/src/block/WaterCauldron.php
@@ -108,14 +108,14 @@ final class WaterCauldron extends FillableCauldron{
 	}
 
 	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
-		if(($newColor = match($item->getTypeId()){
-				ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE()->getRgbValue(),
-				ItemTypeIds::INK_SAC => DyeColor::BLACK()->getRgbValue(),
-				ItemTypeIds::COCOA_BEANS => DyeColor::BROWN()->getRgbValue(),
-				ItemTypeIds::BONE_MEAL => DyeColor::WHITE()->getRgbValue(),
-				ItemTypeIds::DYE => $item instanceof Dye ? $item->getColor()->getRgbValue() : null,
+		if(($dyeColor = match($item->getTypeId()){
+				ItemTypeIds::LAPIS_LAZULI => DyeColor::BLUE(),
+				ItemTypeIds::INK_SAC => DyeColor::BLACK(),
+				ItemTypeIds::COCOA_BEANS => DyeColor::BROWN(),
+				ItemTypeIds::BONE_MEAL => DyeColor::WHITE(),
+				ItemTypeIds::DYE => $item instanceof Dye ? $item->getColor() : 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()->addSound($this->position->add(0.5, 0.5, 0.5), new CauldronAddDyeSound());