mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 15:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source 
# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
This commit is contained in:
Dylan K. Taylor
2020-06-01 13:42:59 +01:00
parent 484557935e 92cffc00d0
commit f24be2b055
15 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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