From 9fac896f282dd22664443b3eaeb684845ec3b674 Mon Sep 17 00:00:00 2001 From: Striker209MPE Date: Tue, 20 Jan 2015 16:29:29 +0100 Subject: [PATCH 1/2] Removed useless spawned check... because it has already be done before --- src/pocketmine/Player.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index a46a62594..591dab0cf 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1232,7 +1232,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{ if($this->onGround){ $this->inAirTicks = 0; }else{ - if($this->inAirTicks > 20 and $this->isSurvival() and !$this->isSleeping() and $this->spawned){ + if($this->inAirTicks > 20 and $this->isSurvival() and !$this->isSleeping()){ $expectedVelocity = (-$this->gravity) / $this->drag - ((-$this->gravity) / $this->drag) * exp(-$this->drag * ($this->inAirTicks - 2)); $diff = ($this->speed->y - $expectedVelocity) ** 2; From 7c64a33389f98032504cc0e42e2a7851b1cbd202 Mon Sep 17 00:00:00 2001 From: Intyre Date: Wed, 21 Jan 2015 14:48:31 +0100 Subject: [PATCH 2/2] Fixed #2557 --- src/pocketmine/block/Sapling.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index 6015b85a3..7b92e4518 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -38,7 +38,7 @@ class Sapling extends Flowable{ protected $id = self::SAPLING; public function __construct($meta = 0){ - $this->meta = 0; + $this->meta = $meta; } public function canBeActivated(){