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

Rename BlockIds -> BlockLegacyIds

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-23 19:46:31 +00:00
parent 79ef8e0803
commit 2a3e6dcf00
83 changed files with 541 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/projectile/EnderPearl.php
View File

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace pocketmine\entity\projectile;
use pocketmine\block\Block;
use pocketmine\block\BlockIds;
use pocketmine\block\BlockLegacyIds;
use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\ProjectileHitEvent;
use pocketmine\level\sound\EndermanTeleportSound;
@ -37,7 +37,7 @@ class EnderPearl extends Throwable{
public const NETWORK_ID = self::ENDER_PEARL;
protected function calculateInterceptWithBlock(Block $block, Vector3 $start, Vector3 $end) : ?RayTraceResult{
if($block->getId() !== BlockIds::AIR and empty($block->getCollisionBoxes())){
if($block->getId() !== BlockLegacyIds::AIR and empty($block->getCollisionBoxes())){
//TODO: remove this once block collision boxes are fixed properly
return AxisAlignedBB::one()->offset($block->x, $block->y, $block->z)->calculateIntercept($start, $end);
}

10
src/pocketmine/entity/projectile/SplashPotion.php
View File

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace pocketmine\entity\projectile;
use pocketmine\block\BlockFactory;
use pocketmine\block\BlockIds;
use pocketmine\block\BlockLegacyIds;
use pocketmine\entity\effect\EffectInstance;
use pocketmine\entity\effect\InstantEffect;
use pocketmine\entity\Living;
@ -121,12 +121,12 @@ class SplashPotion extends Throwable{
}elseif($event instanceof ProjectileHitBlockEvent and $this->getPotionId() === Potion::WATER){
$blockIn = $event->getBlockHit()->getSide($event->getRayTraceResult()->getHitFace());
if($blockIn->getId() === BlockIds::FIRE){
$this->level->setBlock($blockIn, BlockFactory::get(BlockIds::AIR));
if($blockIn->getId() === BlockLegacyIds::FIRE){
$this->level->setBlock($blockIn, BlockFactory::get(BlockLegacyIds::AIR));
}
foreach($blockIn->getHorizontalSides() as $horizontalSide){
if($horizontalSide->getId() === BlockIds::FIRE){
$this->level->setBlock($horizontalSide, BlockFactory::get(BlockIds::AIR));
if($horizontalSide->getId() === BlockLegacyIds::FIRE){
$this->level->setBlock($horizontalSide, BlockFactory::get(BlockLegacyIds::AIR));
}
}
}