mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-31 07:21:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-06-13 15:27:29 +01:00
commit cc00b3e19b
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -51,7 +51,7 @@
"respect/validation": "^2.0" "respect/validation": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.88", "phpstan/phpstan": "0.12.89",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2", "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

18
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "34888ad7b5a7e0f4976901788037b6c2", "content-hash": "b686b4b92fc44feb5f5ba22a5388afd2",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1834,16 +1834,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.88", "version": "0.12.89",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68" "reference": "54c0f5a6c30511b77128d58b6369f718df250542"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/464d1a81af49409c41074aa6640ed0c4cbd9bb68", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/54c0f5a6c30511b77128d58b6369f718df250542",
"reference": "464d1a81af49409c41074aa6640ed0c4cbd9bb68", "reference": "54c0f5a6c30511b77128d58b6369f718df250542",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1874,13 +1874,17 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.88" "source": "https://github.com/phpstan/phpstan/tree/0.12.89"
}, },
"funding": [ "funding": [
{ {
"url": "https://github.com/ondrejmirtes", "url": "https://github.com/ondrejmirtes",
"type": "github" "type": "github"
}, },
{
"url": "https://github.com/phpstan",
"type": "github"
},
{ {
"url": "https://www.patreon.com/phpstan", "url": "https://www.patreon.com/phpstan",
"type": "patreon" "type": "patreon"
@ -1890,7 +1894,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-17T12:24:49+00:00" "time": "2021-06-09T20:23:49+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

17
src/entity/Human.php
View File

@ -47,7 +47,6 @@ use pocketmine\nbt\tag\StringTag;
use pocketmine\network\mcpe\convert\SkinAdapterSingleton; use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
use pocketmine\network\mcpe\convert\TypeConverter; use pocketmine\network\mcpe\convert\TypeConverter;
use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\mcpe\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
use pocketmine\network\mcpe\protocol\types\entity\EntityIds; use pocketmine\network\mcpe\protocol\types\entity\EntityIds;
@ -472,22 +471,6 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
return $vector3->add(0, 1.621, 0); //TODO: +0.001 hack for MCPE falling underground return $vector3->add(0, 1.621, 0); //TODO: +0.001 hack for MCPE falling underground
} }
public function broadcastMovement(bool $teleport = false) : void{
//TODO: workaround 1.14.30 bug: MoveActor(Absolute|Delta)Packet don't work on players anymore :(
$pk = new MovePlayerPacket();
$pk->entityRuntimeId = $this->getId();
$pk->position = $this->getOffsetPosition($this->location);
$pk->yaw = $this->location->yaw;
$pk->pitch = $this->location->pitch;
$pk->headYaw = $this->location->yaw;
$pk->mode = $teleport ? MovePlayerPacket::MODE_TELEPORT : MovePlayerPacket::MODE_NORMAL;
//we can't assume that everyone who is using our chunk wants to see this movement,
//because this human might be a player who shouldn't be receiving his own movement.
//this didn't matter when we were able to use MoveActorPacket because
//the client just ignored MoveActor for itself, but it doesn't ignore MovePlayer for itself.
$this->server->broadcastPackets($this->hasSpawned, [$pk]);
}
protected function onDispose() : void{ protected function onDispose() : void{
$this->inventory->removeAllViewers(); $this->inventory->removeAllViewers();
$this->inventory->getHeldItemIndexChangeListeners()->clear(); $this->inventory->getHeldItemIndexChangeListeners()->clear();