Merge commit 'a3f633862'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
This commit is contained in:
Dylan K. Taylor 2020-06-03 13:03:23 +01:00
commit d2d4780653

View File

@ -655,6 +655,11 @@ class InGamePacketHandler extends PacketHandler{
$modifiedPages[] = $packet->pageNumber; $modifiedPages[] = $packet->pageNumber;
break; break;
case BookEditPacket::TYPE_ADD_PAGE: case BookEditPacket::TYPE_ADD_PAGE:
if(!$newBook->pageExists($packet->pageNumber)){
//this may only come before a page which already exists
//TODO: the client can send insert-before actions on trailing client-side pages which cause odd behaviour on the server
return false;
}
$newBook->insertPage($packet->pageNumber, $packet->text); $newBook->insertPage($packet->pageNumber, $packet->text);
$modifiedPages[] = $packet->pageNumber; $modifiedPages[] = $packet->pageNumber;
break; break;