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

NetworkSession: explicitly unregister effect manager hooks on dispose,

Browse Source 
close #3455
This commit is contained in:
Dylan K. Taylor
2020-05-14 10:58:37 +01:00
parent 36c5d9117d
commit 3dafee6aa6
2 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/entity/effect/EffectManager.php
View File

@ -23,14 +23,13 @@ declare(strict_types=1);
namespace pocketmine\entity\effect;
use Ds\Set;
use pocketmine\entity\Living;
use pocketmine\event\entity\EntityEffectAddEvent;
use pocketmine\event\entity\EntityEffectRemoveEvent;
use pocketmine\utils\Color;
use pocketmine\utils\Utils;
use function abs;
use function count;
use function spl_object_id;
class EffectManager{
@ -46,19 +45,21 @@ class EffectManager{
protected $onlyAmbientEffects = false;
/**
* @var \Closure[]
* @phpstan-var (\Closure(EffectInstance, bool $replacesOldEffect) : void)[]
* @var \Closure[]|Set
* @phpstan-var Set<\Closure(EffectInstance, bool $replacesOldEffect) : void>
*/
protected $effectAddHooks = [];
protected $effectAddHooks;
/**
* @var \Closure[]
* @phpstan-var (\Closure(EffectInstance) : void)[]
* @var \Closure[]|Set
* @phpstan-var Set<\Closure(EffectInstance) : void>
*/
protected $effectRemoveHooks = [];
protected $effectRemoveHooks;
public function __construct(Living $entity){
$this->entity = $entity;
$this->bubbleColor = new Color(0, 0, 0, 0);
$this->effectAddHooks = new Set();
$this->effectRemoveHooks = new Set();
}
/**
@ -222,18 +223,18 @@ class EffectManager{
}
/**
* @phpstan-param \Closure(EffectInstance, bool $replacesOldEffect) : void $closure
* @return \Closure[]|Set
* @phpstan-return Set<\Closure(EffectInstance, bool $replacesOldEffect) : void>
*/
public function onEffectAdd(\Closure $closure) : void{
Utils::validateCallableSignature(function(EffectInstance $effect, bool $replacesOldEffect) : void{}, $closure);
$this->effectAddHooks[spl_object_id($closure)] = $closure;
public function getEffectAddHooks() : Set{
return $this->effectAddHooks;
}
/**
* @phpstan-param \Closure(EffectInstance) : void $closure
* @return \Closure[]|Set
* @phpstan-return Set<\Closure(EffectInstance) : void>
*/
public function onEffectRemove(\Closure $closure) : void{
Utils::validateCallableSignature(function(EffectInstance $effect) : void{}, $closure);
$this->effectRemoveHooks[spl_object_id($closure)] = $closure;
public function getEffectRemoveHooks() : Set{
return $this->effectRemoveHooks;
}
}