Merge commit 'c3a795e87'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/entity/Entity.php
This commit is contained in:
Dylan K. Taylor
2020-05-31 14:56:37 +01:00
3 changed files with 9 additions and 0 deletions

View File

@ -435,6 +435,11 @@ parameters:
count: 1
path: ../../../src/network/mcpe/NetworkSession.php
-
message: "#^Cannot access property \\$onGround on pocketmine\\\\player\\\\Player\\|null\\.$#"
count: 1
path: ../../../src/network/mcpe/NetworkSession.php
-
message: "#^Cannot call method syncCreative\\(\\) on pocketmine\\\\network\\\\mcpe\\\\InventoryManager\\|null\\.$#"
count: 1