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

add a more flexible hook system to EffectManager

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-08-01 19:36:13 +01:00
parent d09e79e682
commit 7e4236a3ec
4 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,9 @@ 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 spl_object_id;
class EffectManager{
@ -42,6 +44,11 @@ class EffectManager{
/** @var bool */
protected $onlyAmbientEffects = false;
/** @var \Closure[] */
protected $effectAddHooks = [];
/** @var \Closure[] */
protected $effectRemoveHooks = [];
public function __construct(Living $entity){
$this->entity = $entity;
$this->bubbleColor = new Color(0, 0, 0, 0);
@ -78,14 +85,18 @@ class EffectManager{
$ev->call();
if($ev->isCancelled()){
if($hasExpired and !$ev->getEffect()->hasExpired()){ //altered duration of an expired effect to make it not get removed
$this->entity->onEffectAdded($ev->getEffect(), true);
foreach($this->effectAddHooks as $hook){
$hook($ev->getEffect(), true);
}
}
return;
}
unset($this->effects[$index]);
$effect->getType()->remove($this->entity, $effect);
$this->entity->onEffectRemoved($effect);
foreach($this->effectRemoveHooks as $hook){
$hook($effect);
}
$this->recalculateEffectColor();
}
@ -151,7 +162,9 @@ class EffectManager{
}
$effect->getType()->add($this->entity, $effect);
$this->entity->onEffectAdded($effect, $oldEffect !== null);
foreach($this->effectAddHooks as $hook){
$hook($effect, $oldEffect !== null);
}
$this->effects[$index] = $effect;
@ -218,4 +231,14 @@ class EffectManager{
return !empty($this->effects);
}
public function onEffectAdd(\Closure $closure) : void{
Utils::validateCallableSignature(function(EffectInstance $effect, bool $replacesOldEffect) : void{}, $closure);
$this->effectAddHooks[spl_object_id($closure)] = $closure;
}
public function onEffectRemove(\Closure $closure) : void{
Utils::validateCallableSignature(function(EffectInstance $effect) : void{}, $closure);
$this->effectRemoveHooks[spl_object_id($closure)] = $closure;
}
}