mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-25 04:44:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '7af4e70f6'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Entity.php
This commit is contained in:
Dylan K. Taylor 2020-06-04 14:02:00 +01:00
commit 3e9018a838
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/Entity.php
View File

@ -1442,7 +1442,7 @@ abstract class Entity{
$this->setMotion($this->temporalVector->setComponents(0, 0, 0)); $this->setMotion($this->temporalVector->setComponents(0, 0, 0));
if($this->setPositionAndRotation($pos, $yaw ?? $this->location->yaw, $pitch ?? $this->location->pitch)){ if($this->setPositionAndRotation($pos, $yaw ?? $this->location->yaw, $pitch ?? $this->location->pitch)){
$this->resetFallDistance(); $this->resetFallDistance();
$this->onGround = true; $this->setForceMovementUpdate();
$this->updateMovement(true); $this->updateMovement(true);