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

SplashPotion: Require potionId in constructor

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-06-19 19:47:44 +01:00
parent fc70b625b3
commit 6fea09ded4
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/entity/projectile/SplashPotion.php
View File

@ -28,7 +28,9 @@ use pocketmine\block\VanillaBlocks;
use pocketmine\color\Color;
use pocketmine\entity\effect\EffectInstance;
use pocketmine\entity\effect\InstantEffect;
use pocketmine\entity\Entity;
use pocketmine\entity\Living;
use pocketmine\entity\Location;
use pocketmine\event\entity\ProjectileHitBlockEvent;
use pocketmine\event\entity\ProjectileHitEntityEvent;
use pocketmine\event\entity\ProjectileHitEvent;
@ -54,12 +56,11 @@ class SplashPotion extends Throwable{
/** @var bool */
protected $linger = false;
/** @var int */
protected $potionId = Potion::WATER;
protected $potionId;
protected function initEntity(CompoundTag $nbt) : void{
parent::initEntity($nbt);
$this->setPotionId($nbt->getShort("PotionId", Potion::WATER));
public function __construct(Location $location, ?Entity $shootingEntity, int $potionId, ?CompoundTag $nbt = null){
$this->potionId = $potionId;
parent::__construct($location, $shootingEntity, $nbt);
}
public function saveNBT() : CompoundTag{