mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-09 21:24:53 +00:00
Code Issues Projects Releases Wiki Activity

fixed players need to move to pick up dropped items, close #498

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-01 19:33:16 +01:00
parent f75cc93160
commit 874afc2fd2
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/Player.php
View File

@ -1570,10 +1570,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
} }
if(!$this->isSpectator()){
$this->checkNearEntities($tickDiff);
}
$this->speed = ($to->subtract($from))->divide($tickDiff); $this->speed = ($to->subtract($from))->divide($tickDiff);
}elseif($distanceSquared == 0){ }elseif($distanceSquared == 0){
$this->speed = new Vector3(0, 0, 0); $this->speed = new Vector3(0, 0, 0);
@ -1663,7 +1659,10 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->processMovement($tickDiff); $this->processMovement($tickDiff);
$this->entityBaseTick($tickDiff); $this->entityBaseTick($tickDiff);
if(!$this->isSpectator() and $this->speed !== null){ if(!$this->isSpectator()){
$this->checkNearEntities($tickDiff);
if($this->speed !== null){
if($this->onGround){ if($this->onGround){
if($this->inAirTicks !== 0){ if($this->inAirTicks !== 0){
$this->startAirTicks = 5; $this->startAirTicks = 5;
@ -1679,6 +1678,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->setMotion(new Vector3(0, $expectedVelocity, 0)); $this->setMotion(new Vector3(0, $expectedVelocity, 0));
}elseif($this->kick("Flying is not enabled on this server")){ }elseif($this->kick("Flying is not enabled on this server")){
$this->timings->stopTiming(); $this->timings->stopTiming();
return false; return false;
} }
} }
@ -1688,6 +1688,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
} }
} }
}
$this->checkTeleportPosition(); $this->checkTeleportPosition();