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

Disallow the use of @handleCancelled on non-cancellable events

Browse Source 
closes #3464
This commit is contained in:
Dylan K. Taylor 2021-10-11 15:12:16 +01:00
parent 8ac16345a3
commit 500c298aaf
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugin/PluginManager.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\plugin; namespace pocketmine\plugin;
use pocketmine\event\Cancellable;
use pocketmine\event\Event; use pocketmine\event\Event;
use pocketmine\event\EventPriority; use pocketmine\event\EventPriority;
use pocketmine\event\HandlerListManager; use pocketmine\event\HandlerListManager;
@ -60,6 +61,7 @@ use function is_subclass_of;
use function iterator_to_array; use function iterator_to_array;
use function mkdir; use function mkdir;
use function shuffle; use function shuffle;
use function sprintf;
use function stripos; use function stripos;
use function strpos; use function strpos;
use function strtolower; use function strtolower;
@ -528,6 +530,14 @@ class PluginManager{
$handleCancelled = false; $handleCancelled = false;
if(isset($tags[ListenerMethodTags::HANDLE_CANCELLED])){ if(isset($tags[ListenerMethodTags::HANDLE_CANCELLED])){
if(!is_a($eventClass, Cancellable::class, true)){
throw new PluginException(sprintf(
"Event handler %s() declares @%s for non-cancellable event of type %s",
Utils::getNiceClosureName($handlerClosure),
ListenerMethodTags::HANDLE_CANCELLED,
$eventClass
));
}
switch(strtolower($tags[ListenerMethodTags::HANDLE_CANCELLED])){ switch(strtolower($tags[ListenerMethodTags::HANDLE_CANCELLED])){
case "true": case "true":
case "": case "":