mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-28 22:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Player base offset doesn't change with scale, close #943, close #945

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-17 12:59:29 +01:00
parent e9a638d84a
commit 0cf3914f5d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@ -290,6 +290,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
protected $stepHeight = 0.6; protected $stepHeight = 0.6;
protected $baseOffset = 1.62;
public $usedChunks = []; public $usedChunks = [];
protected $chunkLoadCount = 0; protected $chunkLoadCount = 0;
protected $loadQueue = []; protected $loadQueue = [];
@ -1580,7 +1582,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
if($to->distanceSquared($ev->getTo()) > 0.01){ //If plugins modify the destination if($to->distanceSquared($ev->getTo()) > 0.01){ //If plugins modify the destination
$this->teleport($ev->getTo()); $this->teleport($ev->getTo());
}else{ }else{
$this->level->addEntityMovement($this->x >> 4, $this->z >> 4, $this->getId(), $this->x, $this->y + $this->getEyeHeight(), $this->z, $this->yaw, $this->pitch, $this->yaw); $this->level->addEntityMovement($this->x >> 4, $this->z >> 4, $this->getId(), $this->x, $this->y + $this->baseOffset, $this->z, $this->yaw, $this->pitch, $this->yaw);
$distance = $from->distance($to); $distance = $from->distance($to);
//TODO: check swimming (adds 0.015 exhaustion in MCPE) //TODO: check swimming (adds 0.015 exhaustion in MCPE)
@ -2135,7 +2137,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
public function handleMovePlayer(MovePlayerPacket $packet) : bool{ public function handleMovePlayer(MovePlayerPacket $packet) : bool{
$newPos = new Vector3($packet->x, $packet->y - $this->getEyeHeight(), $packet->z); $newPos = new Vector3($packet->x, $packet->y - $this->baseOffset, $packet->z);
$revert = false; $revert = false;
if(!$this->isAlive() or $this->spawned !== true){ if(!$this->isAlive() or $this->spawned !== true){
@ -3962,7 +3964,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$pk = new MovePlayerPacket(); $pk = new MovePlayerPacket();
$pk->entityRuntimeId = $this->getId(); $pk->entityRuntimeId = $this->getId();
$pk->x = $pos->x; $pk->x = $pos->x;
$pk->y = $pos->y + $this->getEyeHeight(); $pk->y = $pos->y + $this->baseOffset;
$pk->z = $pos->z; $pk->z = $pos->z;
$pk->bodyYaw = $yaw; $pk->bodyYaw = $yaw;
$pk->pitch = $pitch; $pk->pitch = $pitch;