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

Merge 'minor-next' into 'major-next'

Browse Source 
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/14544397106
This commit is contained in:
pmmp-admin-bot[bot]
2025-04-19 01:36:21 +00:00
parent 5617347949 028815490e
commit baee0110c7
5 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/block/Water.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityExtinguishEvent;
use pocketmine\world\sound\BucketEmptyWaterSound;
use pocketmine\world\sound\BucketFillWaterSound;
use pocketmine\world\sound\Sound;
@ -53,7 +54,7 @@ class Water extends Liquid{
public function onEntityInside(Entity $entity) : bool{
$entity->resetFallDistance();
if($entity->isOnFire()){
$entity->extinguish();
$entity->extinguish(EntityExtinguishEvent::CAUSE_WATER);
}
return true;
}

3
src/block/WaterCauldron.php
View File

@ -27,6 +27,7 @@ use pocketmine\block\tile\Cauldron as TileCauldron;
use pocketmine\block\utils\DyeColor;
use pocketmine\color\Color;
use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityExtinguishEvent;
use pocketmine\item\Armor;
use pocketmine\item\Banner;
use pocketmine\item\Dye;
@ -183,7 +184,7 @@ final class WaterCauldron extends FillableCauldron{
public function onEntityInside(Entity $entity) : bool{
if($entity->isOnFire()){
$entity->extinguish();
$entity->extinguish(EntityExtinguishEvent::CAUSE_WATER_CAULDRON);
//TODO: particles
$this->position->getWorld()->setBlock($this->position, $this->withFillLevel($this->getFillLevel() - self::ENTITY_EXTINGUISH_USE_AMOUNT));