Merge commit 'cda3e6f4dcc5a642c6c2597b77df7f29ecbb9397'

This commit is contained in:
Dylan K. Taylor 2020-01-09 16:49:04 +00:00
commit e0ed123236

View File

@ -46,6 +46,7 @@ class PluginDescription{
private $api; private $api;
/** @var int[] */ /** @var int[] */
private $compatibleMcpeProtocols = []; private $compatibleMcpeProtocols = [];
/** @var string[][] */
private $extensions = []; private $extensions = [];
private $depend = []; private $depend = [];
private $softDepend = []; private $softDepend = [];
@ -195,7 +196,7 @@ class PluginDescription{
} }
/** /**
* @return array * @return string[][]
*/ */
public function getRequiredExtensions() : array{ public function getRequiredExtensions() : array{
return $this->extensions; return $this->extensions;
@ -212,9 +213,6 @@ class PluginDescription{
throw new PluginException("Required extension $name not loaded"); throw new PluginException("Required extension $name not loaded");
} }
if(!is_array($versionConstrs)){
$versionConstrs = [$versionConstrs];
}
$gotVersion = phpversion($name); $gotVersion = phpversion($name);
foreach($versionConstrs as $constr){ // versionConstrs_loop foreach($versionConstrs as $constr){ // versionConstrs_loop
if($constr === "*"){ if($constr === "*"){