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

Merge commit '2b58f2baf'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/entity/object/FallingBlock.php
This commit is contained in:
Dylan K. Taylor 2020-06-03 12:47:44 +01:00
commit e7d712aeb6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/object/FallingBlock.php
View File

@ -112,7 +112,7 @@ class FallingBlock extends Entity{
$this->flagForDespawn(); $this->flagForDespawn();
$block = $world->getBlock($pos); $block = $world->getBlock($pos);
if(($block->isTransparent() and !$block->canBeReplaced()) or !$world->isInWorld($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ()) or ($this->onGround and abs($this->location->y - $this->location->getFloorY()) > 0.001)){ if(!$block->canBeReplaced() or !$world->isInWorld($pos->getFloorX(), $pos->getFloorY(), $pos->getFloorZ()) or ($this->onGround and abs($this->location->y - $this->location->getFloorY()) > 0.001)){
//FIXME: anvils are supposed to destroy torches //FIXME: anvils are supposed to destroy torches
$world->dropItem($this->location, $this->block->asItem()); $world->dropItem($this->location, $this->block->asItem());
}else{ }else{