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

DustParticle constructor now uses Color object

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-08-19 18:57:26 +01:00
parent 1262b06797
commit 3274db3ddc
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/defaults/ParticleCommand.php
View File

@ -31,6 +31,7 @@ use pocketmine\item\VanillaItems;
use pocketmine\lang\TranslationContainer;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
use pocketmine\utils\Color;
use pocketmine\utils\Random;
use pocketmine\utils\TextFormat;
use pocketmine\world\particle\AngryVillagerParticle;
@ -224,7 +225,7 @@ class ParticleCommand extends VanillaCommand{
}elseif(strpos($name, "blockdust_") === 0){
$d = explode("_", $name);
if(count($d) >= 4){
return new DustParticle(((int) $d[1]) & 0xff, ((int) $d[2]) & 0xff, ((int) $d[3]) & 0xff, isset($d[4]) ? ((int) $d[4]) & 0xff : 255);
return new DustParticle(new Color(((int) $d[1]) & 0xff, ((int) $d[2]) & 0xff, ((int) $d[3]) & 0xff, isset($d[4]) ? ((int) $d[4]) & 0xff : 255));
}
}

5
src/world/particle/DustParticle.php
View File

@ -24,9 +24,10 @@ declare(strict_types=1);
namespace pocketmine\world\particle;
use pocketmine\network\mcpe\protocol\types\ParticleIds;
use pocketmine\utils\Color;
class DustParticle extends GenericParticle{
public function __construct(int $r, int $g, int $b, int $a = 255){
parent::__construct(ParticleIds::DUST, (($a & 0xff) << 24) | (($r & 0xff) << 16) | (($g & 0xff) << 8) | ($b & 0xff));
public function __construct(Color $color){
parent::__construct(ParticleIds::DUST, $color->toARGB());
}
}