From 2b6d0587603a970940454bb261fad90ed1edc24f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 3 Oct 2016 09:17:50 +0100 Subject: [PATCH] Fixed kicked for flying when walking on lily pads (#7) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add an optional extended description… --- src/pocketmine/block/Flowable.php | 5 +---- src/pocketmine/block/WaterLily.php | 18 +++++------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/pocketmine/block/Flowable.php b/src/pocketmine/block/Flowable.php index 3c380301ef9..65a86c69f8f 100644 --- a/src/pocketmine/block/Flowable.php +++ b/src/pocketmine/block/Flowable.php @@ -21,9 +21,6 @@ namespace pocketmine\block; - - - abstract class Flowable extends Transparent{ public function canBeFlowedInto(){ @@ -42,7 +39,7 @@ public function isSolid(){ return false; } - public function getBoundingBox(){ + protected function recalculateBoundingBox(){ return null; } } \ No newline at end of file diff --git a/src/pocketmine/block/WaterLily.php b/src/pocketmine/block/WaterLily.php index ef15f56bd2f..b690e87e6e6 100644 --- a/src/pocketmine/block/WaterLily.php +++ b/src/pocketmine/block/WaterLily.php @@ -35,10 +35,6 @@ public function __construct($meta = 0){ $this->meta = $meta; } - public function isSolid(){ - return false; - } - public function getName(){ return "Lily Pad"; } @@ -47,18 +43,14 @@ public function getHardness(){ return 0.6; } - public function canPassThrough(){ - return true; - } - protected function recalculateBoundingBox(){ return new AxisAlignedBB( - $this->x, + $this->x + 0.0625, $this->y, - $this->z, - $this->x, - $this->y + 0.0625, - $this->z + $this->z + 0.0625, + $this->x + 0.9375, + $this->y + 0.015625, + $this->z + 0.9375 ); }