mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 16:59:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'd234d3e45'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/command/defaults/ParticleCommand.php
This commit is contained in:
Dylan K. Taylor 2020-06-03 12:55:46 +01:00
commit b2f182b196
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ use pocketmine\world\particle\CriticalParticle;
use pocketmine\world\particle\DustParticle; use pocketmine\world\particle\DustParticle;
use pocketmine\world\particle\EnchantmentTableParticle; use pocketmine\world\particle\EnchantmentTableParticle;
use pocketmine\world\particle\EnchantParticle; use pocketmine\world\particle\EnchantParticle;
use pocketmine\world\particle\EntityFlameParticle;
use pocketmine\world\particle\ExplodeParticle; use pocketmine\world\particle\ExplodeParticle;
use pocketmine\world\particle\FlameParticle; use pocketmine\world\particle\FlameParticle;
use pocketmine\world\particle\HappyVillagerParticle; use pocketmine\world\particle\HappyVillagerParticle;
@ -202,7 +203,8 @@ class ParticleCommand extends VanillaCommand{
return new AngryVillagerParticle(); return new AngryVillagerParticle();
case "forcefield": case "forcefield":
return new BlockForceFieldParticle($data ?? 0); return new BlockForceFieldParticle($data ?? 0);
case "mobflame":
return new EntityFlameParticle();
} }
if(strpos($name, "iconcrack_") === 0){ if(strpos($name, "iconcrack_") === 0){