mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Utils: fixed testValidInstance() not accepting the same valid class for both className and baseName

Browse Source 
this caused problems in PlayerCreationEvent because plugins set the base class and then set the player class to the same thing.
This commit is contained in:
Dylan K. Taylor
2021-10-26 00:31:30 +01:00
parent 94f4ef5862
commit 4178c81209
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/Utils.php
View File

@@ -519,12 +519,10 @@ final class Utils{
if(!class_exists($className)){ if(!class_exists($className)){
throw new \InvalidArgumentException("Class $className does not exist"); throw new \InvalidArgumentException("Class $className does not exist");
} }
$base = new \ReflectionClass($baseName); if(!is_a($className, $baseName, true)){
$class = new \ReflectionClass($className); throw new \InvalidArgumentException("Class $className does not extend or implement $baseName");
if(!$class->isSubclassOf($baseName)){
throw new \InvalidArgumentException("Class $className does not " . ($base->isInterface() ? "implement" : "extend") . " " . $baseName);
} }
$class = new \ReflectionClass($className);
if(!$class->isInstantiable()){ if(!$class->isInstantiable()){
throw new \InvalidArgumentException("Class $className cannot be constructed"); throw new \InvalidArgumentException("Class $className cannot be constructed");
} }