Merge commit 'c3a795e87'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/entity/Entity.php
This commit is contained in:
Dylan K. Taylor 2020-05-31 14:56:37 +01:00
commit 6df43338df
3 changed files with 9 additions and 0 deletions

View File

@ -763,6 +763,9 @@ abstract class Entity{
if($teleport){
$pk->flags |= MoveActorAbsolutePacket::FLAG_TELEPORT;
}
if($this->onGround){
$pk->flags |= MoveActorAbsolutePacket::FLAG_GROUND;
}
$this->getWorld()->broadcastPacketToViewers($this->location, $pk);
}

View File

@ -665,6 +665,7 @@ class NetworkSession{
$pk->headYaw = $yaw;
$pk->yaw = $yaw;
$pk->mode = $mode;
$pk->onGround = $this->player->onGround;
$this->sendDataPacket($pk);
}

View File

@ -435,6 +435,11 @@ parameters:
count: 1
path: ../../../src/network/mcpe/NetworkSession.php
-
message: "#^Cannot access property \\$onGround on pocketmine\\\\player\\\\Player\\|null\\.$#"
count: 1
path: ../../../src/network/mcpe/NetworkSession.php
-
message: "#^Cannot call method syncCreative\\(\\) on pocketmine\\\\network\\\\mcpe\\\\InventoryManager\\|null\\.$#"
count: 1