mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 15:19:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.1'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-06 13:12:22 +01:00
commit b23c947060
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/network/mcpe/protocol/LoginPacket.php
View File

@ -105,9 +105,15 @@ class LoginPacket extends DataPacket{
$buffer = new BinaryStream($this->getString()); $buffer = new BinaryStream($this->getString());
$this->chainData = json_decode($buffer->get($buffer->getLInt()), true); $this->chainData = json_decode($buffer->get($buffer->getLInt()), true);
$hasExtraData = false;
foreach($this->chainData["chain"] as $chain){ foreach($this->chainData["chain"] as $chain){
$webtoken = Utils::decodeJWT($chain); $webtoken = Utils::decodeJWT($chain);
if(isset($webtoken["extraData"])){ if(isset($webtoken["extraData"])){
if($hasExtraData){
throw new \RuntimeException("Found 'extraData' multiple times in key chain");
}
$hasExtraData = true;
if(isset($webtoken["extraData"]["displayName"])){ if(isset($webtoken["extraData"]["displayName"])){
$this->username = $webtoken["extraData"]["displayName"]; $this->username = $webtoken["extraData"]["displayName"];
} }

1
src/pocketmine/plugin/PluginBase.php
View File

@ -267,6 +267,7 @@ abstract class PluginBase implements Plugin{
} }
public function reloadConfig(){ public function reloadConfig(){
@mkdir($this->dataFolder);
$this->config = new Config($this->configFile); $this->config = new Config($this->configFile);
if(($configStream = $this->getResource("config.yml")) !== null){ if(($configStream = $this->getResource("config.yml")) !== null){
$this->config->setDefaults(yaml_parse(Config::fixYAMLIndexes(stream_get_contents($configStream)))); $this->config->setDefaults(yaml_parse(Config::fixYAMLIndexes(stream_get_contents($configStream))));