mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-19 15:35:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into master

Browse Source 
# Conflicts:
#	.gitmodules
#	composer.lock
#	resources/vanilla
#	src/network/mcpe/protocol/PlayerAuthInputPacket.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
This commit is contained in:
Dylan K. Taylor 2020-08-10 17:55:49 +01:00
commit 98db4c5200
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -1,12 +1,12 @@
[submodule "resources/locale"]
path = resources/locale
url = https://github.com/pmmp/PocketMine-Language.git
url = https://github.com/pmmp/Language.git
[submodule "tests/preprocessor"]
path = build/preprocessor
url = https://github.com/pmmp/preprocessor.git
[submodule "tests/plugins/PocketMine-DevTools"]
path = tests/plugins/PocketMine-DevTools
url = https://github.com/pmmp/PocketMine-DevTools.git
[submodule "tests/plugins/DevTools"]
path = tests/plugins/DevTools
url = https://github.com/pmmp/DevTools.git
[submodule "build/php"]
path = build/php
url = https://github.com/pmmp/php-build-scripts.git

2
.travis.yml
View File

@ -26,7 +26,7 @@ before_script:
- pecl install channel://pecl.php.net/igbinary-3.1.2
- git clone https://github.com/pmmp/pthreads.git
- cd pthreads
- git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d
- git checkout 45579e1e622acd80f9c880f3a025ba3b98b8ebef
- phpize
- ./configure
- make

2
README.md
View File

@ -19,7 +19,7 @@
## For developers
* [Building and running from source](BUILDING.md)
* [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development
* [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
* [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
* [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
* [Contributing Guidelines](CONTRIBUTING.md)

2
composer.json
View File

@ -50,7 +50,7 @@
"respect/validation": "^2.0"
},
"require-dev": {
"phpstan/phpstan": "0.12.29",
"phpstan/phpstan": "0.12.36",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "96c53cbd2154a5a665517d9b7d22af6b",
"content-hash": "a518c2e67a38a7f2e4b5de64b602a8e2",
"packages": [
{
"name": "adhocore/json-comment",
@ -1376,20 +1376,20 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.29",
"version": "0.12.36",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a"
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9771daaf6b95c6313b908d0bcdee0afcd51f838a",
"reference": "9771daaf6b95c6313b908d0bcdee0afcd51f838a",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
"shasum": ""
},
"require": {
"php": "^7.1"
"php": "^7.1|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
@ -1428,7 +1428,7 @@
"type": "tidelift"
}
],
"time": "2020-06-14T14:10:59+00:00"
"time": "2020-08-05T09:29:40+00:00"
},
{
"name": "phpstan/phpstan-phpunit",

2
doxygen/index.md
View File

@ -5,6 +5,6 @@ This site contains auto-generated API documentation for PocketMine-MP (and depen
This site can be accessed via https://apidoc.pmmp.io.
### Additional developer resources
- [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
- [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
- [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
- [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API

4
src/network/mcpe/protocol/PlayerAuthInputPacket.php
View File

@ -128,8 +128,8 @@ class PlayerAuthInputPacket extends DataPacket implements ServerboundPacket{
}
protected function decodePayload(PacketSerializer $in) : void{
$this->yaw = $in->getLFloat();
$this->pitch = $in->getLFloat();
$this->yaw = $in->getLFloat();
$this->position = $in->getVector3();
$this->moveVecX = $in->getLFloat();
$this->moveVecZ = $in->getLFloat();
@ -143,8 +143,8 @@ class PlayerAuthInputPacket extends DataPacket implements ServerboundPacket{
}
protected function encodePayload(PacketSerializer $out) : void{
$out->putLFloat($this->yaw);
$out->putLFloat($this->pitch);
$out->putLFloat($this->yaw);
$out->putVector3($this->position);
$out->putLFloat($this->moveVecX);
$out->putLFloat($this->moveVecZ);

2
src/timings/Timings.php
View File

@ -164,7 +164,7 @@ abstract class Timings{
}
public static function getScheduledTaskTimings(TaskHandler $task, int $period) : TimingsHandler{
$name = "Task: " . ($task->getOwnerName() ?? "Unknown") . " Runnable: " . $task->getTaskName();
$name = "Task: " . $task->getOwnerName() . " Runnable: " . $task->getTaskName();
if($period > 0){
$name .= "(interval:" . $period . ")";

0
tests/plugins/PocketMine-DevTools → tests/plugins/DevTools
View File

2
tests/travis.sh
View File

@ -17,7 +17,7 @@ PLUGINS_DIR="$DATA_DIR/plugins"
rm -rf "$DATA_DIR"
rm PocketMine-MP.phar 2> /dev/null
cd tests/plugins/PocketMine-DevTools
cd tests/plugins/DevTools
php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar
cd ../../..