From 96857c65b6e2b3eebc14f64b8e1b57f794b0d80a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 27 Jan 2019 15:08:08 +0000 Subject: [PATCH] Player: Fixed subscribing to broadcast permissions too early Plugins would indirectly trigger permissible recalculation too early in the login sequence, which then caused their permissions to be recalculated and subscribing them to the broadcast permission far too early. --- src/pocketmine/Player.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 2c6d5c2d6..ef49d4dc0 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -688,14 +688,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $this->perm->recalculatePermissions(); - if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){ - $permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this); - } - if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){ - $permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); - } - if($this->spawned){ + if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){ + $permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this); + } + if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){ + $permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); + } + $this->sendCommandData(); } }