From f933f4bec958b545fe997dcbdb8c4088cb157ce9 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 18 Mar 2023 22:04:23 +0300 Subject: [PATCH] phar plugins should support multiple api versions --- src/API/LevelAPI.php | 5 ++++- src/API/PluginAPI.php | 2 +- src/plugin/phar/PharUtils.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/API/LevelAPI.php b/src/API/LevelAPI.php index 93f6a15f..8285bb84 100644 --- a/src/API/LevelAPI.php +++ b/src/API/LevelAPI.php @@ -96,7 +96,10 @@ class LevelAPI{ } return true; } - + /** + * @param string $name + * @return Level|boolean + */ public function get($name){ if(isset($this->levels[$name])){ return $this->levels[$name]; diff --git a/src/API/PluginAPI.php b/src/API/PluginAPI.php index 6cc65250..fa054af9 100644 --- a/src/API/PluginAPI.php +++ b/src/API/PluginAPI.php @@ -148,7 +148,7 @@ class PluginAPI extends stdClass{ console("[INFO] Loading PHAR plugin \"".FORMAT_GREEN.$pluginInfo["name"].FORMAT_RESET."\" ".FORMAT_AQUA.$pluginInfo["version"].FORMAT_RESET." by ".FORMAT_AQUA.$pluginInfo["author"].FORMAT_RESET); $aver = CURRENT_API_VERSION; - if($pluginInfo["api"] != $aver){ + if(!in_array((string) CURRENT_API_VERSION, $pluginInfo["api"])){ console("[WARNING] API is not the same as Core, might cause bugs({$pluginInfo["api"]} != {$aver})"); } diff --git a/src/plugin/phar/PharUtils.php b/src/plugin/phar/PharUtils.php index 6aaea321..07ae80b7 100644 --- a/src/plugin/phar/PharUtils.php +++ b/src/plugin/phar/PharUtils.php @@ -19,7 +19,7 @@ class PharUtils{ $pluginData["version"] = trim($content["version"]); $pluginData["author"] = trim($content["author"]); $pluginData["mainFile"] = trim($content["mainFile"]); - $pluginData["api"] = trim($content["api"]); + $pluginData["api"] = explode(",", trim($content["api"])); $pluginData["classLoader"] = trim($content["classLoader"]); $pluginData["CLClass"] = self::getNameSpaceClass($pluginData["classLoader"]); return $pluginData;