Merge commit '42e14f749'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/item/Bow.php
#	src/world/World.php
This commit is contained in:
Dylan K. Taylor
2020-06-03 12:31:17 +01:00
4 changed files with 13 additions and 10 deletions

View File

@ -173,11 +173,6 @@ class InGamePacketHandler extends PacketHandler{
}
public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
if($this->player->isSpectator()){
$this->session->getInvManager()->syncAll();
return true;
}
$result = true;
if($packet->trData instanceof NormalTransactionData){