mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 13:49:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:PocketMine/PocketMine-MP

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-01-24 10:35:24 +01:00
commit ea44eee5df
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -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;

2
src/pocketmine/block/Sapling.php
View File

@ -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(){