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

Merge commit '57b6451e1'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/block/Ladder.php
This commit is contained in:
Dylan K. Taylor 2020-07-04 22:22:22 +01:00
commit 740ed2013f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/block/Ladder.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\block\utils\BlockDataSerializer; use pocketmine\block\utils\BlockDataSerializer;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\Living;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing; use pocketmine\math\Facing;
@ -66,7 +67,7 @@ class Ladder extends Transparent{
} }
public function onEntityInside(Entity $entity) : void{ public function onEntityInside(Entity $entity) : void{
if($entity->getPosition()->floor()->distanceSquared($this->pos) < 1){ //entity coordinates must be inside block if($entity instanceof Living && $entity->getPosition()->floor()->distanceSquared($this->pos) < 1){ //entity coordinates must be inside block
$entity->resetFallDistance(); $entity->resetFallDistance();
$entity->onGround = true; $entity->onGround = true;
} }