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

Fixed falling blocks getting moved by currents, closes #2080

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-30 12:20:59 +01:00
parent 5d32587cf7
commit 1d5978df98
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/block/Liquid.php
View File

@ -189,10 +189,12 @@ abstract class Liquid extends Transparent{
}
public function addVelocityToEntity(Entity $entity, Vector3 $vector) : void{
$flow = $this->getFlowVector();
$vector->x += $flow->x;
$vector->y += $flow->y;
$vector->z += $flow->z;
if($entity->canBeMovedByCurrents()){
$flow = $this->getFlowVector();
$vector->x += $flow->x;
$vector->y += $flow->y;
$vector->z += $flow->z;
}
}
abstract public function tickRate() : int;

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

@ -1698,6 +1698,15 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
return $this->blocksAround;
}
/**
* Returns whether this entity can be moved by currents in liquids.
*
* @return bool
*/
public function canBeMovedByCurrents() : bool{
return true;
}
protected function checkBlockCollision(){
$vector = new Vector3(0, 0, 0);

4
src/pocketmine/entity/object/FallingBlock.php
View File

@ -79,6 +79,10 @@ class FallingBlock extends Entity{
return false;
}
public function canBeMovedByCurrents() : bool{
return false;
}
public function attack(EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($source);