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

Entity: Moved PrimedTNT and FallingSand to object\PrimedTNT and object\FallingBlock

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-10 16:25:07 +00:00
parent b39bbffdc5
commit 8a86e0825b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/Entity.php
View File

@ -30,9 +30,11 @@ use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\Water;
use pocketmine\entity\object\ExperienceOrb;
use pocketmine\entity\object\FallingBlock;
use pocketmine\entity\object\ItemEntity;
use pocketmine\entity\object\Painting;
use pocketmine\entity\object\PaintingMotive;
use pocketmine\entity\object\PrimedTNT;
use pocketmine\entity\projectile\Arrow;
use pocketmine\entity\projectile\Egg;
use pocketmine\entity\projectile\EnderPearl;
@ -237,7 +239,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
Entity::registerEntity(EnderPearl::class, false, ['ThrownEnderpearl', 'minecraft:ender_pearl']);
Entity::registerEntity(ExperienceBottle::class, false, ['ThrownExpBottle', 'minecraft:xp_bottle']);
Entity::registerEntity(ExperienceOrb::class, false, ['XPOrb', 'minecraft:xp_orb']);
Entity::registerEntity(FallingSand::class, false, ['FallingSand', 'minecraft:falling_block']);
Entity::registerEntity(FallingBlock::class, false, ['FallingSand', 'minecraft:falling_block']);
Entity::registerEntity(ItemEntity::class, false, ['Item', 'minecraft:item']);
Entity::registerEntity(Painting::class, false, ['Painting', 'minecraft:painting']);
Entity::registerEntity(PrimedTNT::class, false, ['PrimedTnt', 'PrimedTNT', 'minecraft:tnt']);

5
src/pocketmine/entity/FallingSand.php → src/pocketmine/entity/object/FallingBlock.php
View File

@ -21,11 +21,12 @@
declare(strict_types=1);
namespace pocketmine\entity;
namespace pocketmine\entity\object;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\Fallable;
use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityBlockChangeEvent;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\ItemFactory;
@ -33,7 +34,7 @@ use pocketmine\level\Position;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\IntTag;
class FallingSand extends Entity{
class FallingBlock extends Entity{
public const NETWORK_ID = self::FALLING_BLOCK;
public $width = 0.98;

4
src/pocketmine/entity/PrimedTNT.php → src/pocketmine/entity/object/PrimedTNT.php
View File

@ -21,8 +21,10 @@
declare(strict_types=1);
namespace pocketmine\entity;
namespace pocketmine\entity\object;
use pocketmine\entity\Entity;
use pocketmine\entity\Explosive;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\ExplosionPrimeEvent;
use pocketmine\level\Explosion;