Skip to content

Commit

Permalink
Merge remote-tracking branch 'nethergames/stable' into stable
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
#	src/network/mcpe/handler/ResourcePacksPacketHandler.php
  • Loading branch information
DavyCraft648 committed Apr 7, 2024
2 parents 8beaa45 + 5bac0e0 commit c6f2c10
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/network/mcpe/handler/ResourcePacksPacketHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,14 @@ class ResourcePacksPacketHandler extends ChunkRequestPacketHandler{
* @phpstan-param \Closure() : void $completionCallback
*/
public function __construct(
NetworkSession $session,
protected NetworkSession $session,
private array $resourcePackStack,
private array $encryptionKeys,
private bool $mustAccept,
private \Closure $completionCallback
){
parent::__construct($session);

$this->requestQueue = new \SplQueue();
foreach($resourcePackStack as $pack){
$this->resourcePacksById[$pack->getPackId()] = $pack;
Expand Down

0 comments on commit c6f2c10

Please sign in to comment.