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 tag '3.17.7'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-03-14 19:29:32 +00:00
commit a7dbc2c77b
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/preprocessor

@ -1 +1 @@
Subproject commit c8c0557ddf159413352de2a74a013d40fbfe3a69
Subproject commit 3b5a1d3fdf9c006f1daa286db394d8629848234f

13
changelogs/3.17.md
View File

@ -48,3 +48,16 @@ Plugin developers should **only** update their required API to this version if y
- Added some protocol changes for 1.16.200 which were previously overlooked.
- Player XUIDs are now tracked. If a player's XUID does not match the previously recorded XUID when they next join the server, they will be kicked. This can be disabled by the `player.verify-xuid` setting in `pocketmine.yml`.
- `BUILDING.md` now has a note about `build/server-phar.php`'s compression bug (a bug in PHP).
# 3.17.6
- Fixed core race conditions that could have led to server freezes (race conditions in pmmp/Snooze).
- The log message about Xbox Live authentication being enabled has been reduced to INFO, and the tip on how to turn it off removed (disabling it should usually only be done by power users anyway).
- Fixed `PlayerMoveEvent->getFrom()` returning incorrect results for players who experienced movement reversions.
- Fixed a bug in `ResourcePackClientResponsePacket` decoding that caused unexpected results when decoding the packet twice.
- XUID verification now compares XUIDs against players who are already on the server to detect mismatches to avoid unnecessary loading of playerdata.
- Fixed an inventory duplication bug which could occur when the same player joined with two devices at the same time.
- Fixed cursor item not being synced on inventory transaction rollbacks.
- Fixed items with TAG_Float in their NBT not being able to be moved around in the inventory.
# 3.17.7
- Fixed crash caused by preprocessor in 3.17.6.

2
composer.json
View File

@ -49,7 +49,7 @@
"respect/validation": "^2.0"
},
"require-dev": {
"phpstan/phpstan": "0.12.80",
"phpstan/phpstan": "0.12.81",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"

22
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": "5aa48d296aa8e42c1d52fdce2cde29a7",
"content-hash": "351cfe2c61a6ac577ca48813f6fe920d",
"packages": [
{
"name": "adhocore/json-comment",
@ -598,12 +598,12 @@
"source": {
"type": "git",
"url": "https://github.com/pmmp/NBT.git",
"reference": "dbc9d0c0fd09238c3c2b1ef1c154634c2c6b3add"
"reference": "c548a3eb97bd2c14fbea69326e87957e5dfac3e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/dbc9d0c0fd09238c3c2b1ef1c154634c2c6b3add",
"reference": "dbc9d0c0fd09238c3c2b1ef1c154634c2c6b3add",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/c548a3eb97bd2c14fbea69326e87957e5dfac3e1",
"reference": "c548a3eb97bd2c14fbea69326e87957e5dfac3e1",
"shasum": ""
},
"require": {
@ -632,7 +632,7 @@
"issues": "https://github.com/pmmp/NBT/issues",
"source": "https://github.com/pmmp/NBT/tree/master"
},
"time": "2021-03-07T20:54:19+00:00"
"time": "2021-03-14T19:19:46+00:00"
},
{
"name": "pocketmine/raklib",
@ -1579,16 +1579,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.80",
"version": "0.12.81",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686"
"reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6a1b17f22ecf708d434d6bee05092647ec7e686",
"reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
"reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
"shasum": ""
},
"require": {
@ -1619,7 +1619,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.80"
"source": "https://github.com/phpstan/phpstan/tree/0.12.81"
},
"funding": [
{
@ -1635,7 +1635,7 @@
"type": "tidelift"
}
],
"time": "2021-02-28T20:22:43+00:00"
"time": "2021-03-08T22:03:02+00:00"
},
{
"name": "phpstan/phpstan-phpunit",

19
src/network/mcpe/InventoryManager.php
View File

@ -193,9 +193,22 @@ class InventoryManager{
if($windowId !== null){
unset($this->initiatedSlotChanges[$windowId]);
$typeConverter = TypeConverter::getInstance();
$this->session->sendDataPacket(InventoryContentPacket::create($windowId, array_map(function(Item $itemStack) use ($typeConverter) : ItemStackWrapper{
return ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($itemStack));
}, $inventory->getContents(true))));
if($windowId === ContainerIds::UI){
//TODO: HACK!
//Since 1.13, cursor is now part of a larger "UI inventory", and sending contents for this larger inventory does
//not work the way it's intended to. Even if it did, it would be necessary to send all 51 slots just to update
//this one, which is just not worth it.
//This workaround isn't great, but it's at least simple.
$this->session->sendDataPacket(InventorySlotPacket::create(
$windowId,
0,
ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($inventory->getItem(0)))
));
}else{
$this->session->sendDataPacket(InventoryContentPacket::create($windowId, array_map(function(Item $itemStack) use ($typeConverter) : ItemStackWrapper{
return ItemStackWrapper::legacy($typeConverter->coreItemStackToNet($itemStack));
}, $inventory->getContents(true))));
}
}
}