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

Merge branch 'stable' into next-minor

Browse Source 
# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
This commit is contained in:
Dylan K. Taylor
2020-06-01 13:42:59 +01:00
parent 484557935e 92cffc00d0
commit f24be2b055
15 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/item/Bow.php
View File

@ -83,7 +83,7 @@ class Bow extends Tool{
}
$ev = new EntityShootBowEvent($player, $this, $entity, $baseForce * 3);
if($baseForce < 0.1 or $diff < 5){
if($baseForce < 0.1 or $diff < 5 or $player->isSpectator()){
$ev->setCancelled();
}

2
src/pocketmine/item/WritableBook.php
View File

@ -50,7 +50,7 @@ class WritableBook extends Item{
*/
public function getPageText(int $pageId) : ?string{
$pages = $this->getNamedTag()->getListTag(self::TAG_PAGES);
if($pages === null){
if($pages === null or !$pages->isset($pageId)){
return null;
}