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

Added support for overriding properties over the command line

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-06-09 11:23:57 +02:00
parent 2a1a09a923
commit ec226105e4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/Server.php
View File

@ -240,6 +240,8 @@ class Server{
/** @var Config */ /** @var Config */
private $properties; private $properties;
private $propertyCache = [];
/** @var Config */ /** @var Config */
private $config; private $config;
@ -1307,9 +1309,16 @@ class Server{
* @return mixed * @return mixed
*/ */
public function getProperty($variable, $defaultValue = null){ public function getProperty($variable, $defaultValue = null){
$value = $this->config->getNested($variable); if(!array_key_exists($variable, $this->propertyCache)){
$v = getopt("", ["$variable::"]);
if(isset($v[$variable])){
$this->propertyCache[$variable] = $v[$variable];
}else{
$this->propertyCache[$variable] = $this->properties->getNested($variable);
}
}
return $value === null ? $defaultValue : $value; return $this->propertyCache[$variable] === null ? $defaultValue : $this->propertyCache[$variable];
} }
/** /**