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

CandleTrait: allow candle to be lit by fire charges

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-08-09 12:04:02 +01:00
parent f4a06605b1
commit 735d9a5bf4
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/block/utils/CandleTrait.php
View File

@ -33,6 +33,7 @@ use pocketmine\item\ItemTypeIds;
use pocketmine\math\RayTraceResult; use pocketmine\math\RayTraceResult;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\sound\BlazeShootSound;
use pocketmine\world\sound\FireExtinguishSound; use pocketmine\world\sound\FireExtinguishSound;
use pocketmine\world\sound\FlintSteelSound; use pocketmine\world\sound\FlintSteelSound;
@ -57,12 +58,16 @@ trait CandleTrait{
/** @see Block::onInteract() */ /** @see Block::onInteract() */
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($item->getTypeId() === ItemTypeIds::FLINT_AND_STEEL || $item->hasEnchantment(VanillaEnchantments::FIRE_ASPECT())){ if($item->getTypeId() === ItemTypeIds::FIRE_CHARGE || $item->getTypeId() === ItemTypeIds::FLINT_AND_STEEL || $item->hasEnchantment(VanillaEnchantments::FIRE_ASPECT())){
if($this->lit){ if($this->lit){
return true; return true;
} }
if($item instanceof Durable){ if($item instanceof Durable){
$item->applyDamage(1); $item->applyDamage(1);
}elseif($item->getTypeId() === ItemTypeIds::FIRE_CHARGE){
$item->pop();
//TODO: not sure if this is intentional, but it's what Bedrock currently does as of 1.20.10
$this->position->getWorld()->addSound($this->position, new BlazeShootSound());
} }
$this->position->getWorld()->addSound($this->position, new FlintSteelSound()); $this->position->getWorld()->addSound($this->position, new FlintSteelSound());
$this->position->getWorld()->setBlock($this->position, $this->setLit(true)); $this->position->getWorld()->setBlock($this->position, $this->setLit(true));