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

Merge branch master

Browse Source
This commit is contained in:
Jorge González
2016-05-18 10:07:57 -05:00
parent 012d46dfd8
commit 292a212827
11 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/plugin/ScriptPluginLoader.php
View File

@ -94,9 +94,13 @@ class ScriptPluginLoader implements PluginLoader{
$insideHeader = true;
}
if(preg_match("/^[ \t]+\\*[ \t]+@([a-zA-Z]+)[ \t]+(.*)$/", $line, $matches) > 0){
if(preg_match("/^[ \t]+\\*[ \t]+@([a-zA-Z]+)([ \t]+(.*))?$/", $line, $matches) > 0){
$key = $matches[1];
$content = trim($matches[2]);
$content = trim($matches[3] ?? "");
if($key === "notscript"){
return null;
}
$data[$key] = $content;
}
@ -157,4 +161,4 @@ class ScriptPluginLoader implements PluginLoader{
$plugin->setEnabled(false);
}
}
}
}