Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor 2021-12-15 03:12:41 +00:00
commit 4466166f8b
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 13 additions and 7 deletions

12
composer.lock generated
View File

@ -275,16 +275,16 @@
},
{
"name": "pocketmine/bedrock-protocol",
"version": "7.0.0+bedrock-1.18.0",
"version": "7.1.0+bedrock-1.18.0",
"source": {
"type": "git",
"url": "https://github.com/pmmp/BedrockProtocol.git",
"reference": "040a883a4abb8c9b93114d5278cb5fecc635da82"
"reference": "42f2a00634c17c346fd98c05b2daf29d1fbf5805"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/040a883a4abb8c9b93114d5278cb5fecc635da82",
"reference": "040a883a4abb8c9b93114d5278cb5fecc635da82",
"url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/42f2a00634c17c346fd98c05b2daf29d1fbf5805",
"reference": "42f2a00634c17c346fd98c05b2daf29d1fbf5805",
"shasum": ""
},
"require": {
@ -316,9 +316,9 @@
"description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP",
"support": {
"issues": "https://github.com/pmmp/BedrockProtocol/issues",
"source": "https://github.com/pmmp/BedrockProtocol/tree/7.0.0+bedrock-1.18.0"
"source": "https://github.com/pmmp/BedrockProtocol/tree/7.1.0+bedrock-1.18.0"
},
"time": "2021-11-30T19:02:41+00:00"
"time": "2021-12-15T03:07:05+00:00"
},
{
"name": "pocketmine/binaryutils",

View File

@ -696,7 +696,13 @@ class Server{
}
public function removeOp(string $name) : void{
$this->operators->remove(strtolower($name));
$lowercaseName = strtolower($name);
foreach($this->operators->getAll() as $operatorName => $_){
$operatorName = (string) $operatorName;
if($lowercaseName === strtolower($operatorName)){
$this->operators->remove($operatorName);
}
}
if(($player = $this->getPlayerExact($name)) !== null){
$player->unsetBasePermission(DefaultPermissions::ROOT_OPERATOR);