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

EffectManager: remove redundant check (#5153)

Browse Source
This commit is contained in:
Ali 2022-07-14 19:56:18 +03:00 committed by GitHub
parent 75d7adfb2d
commit 705df7d508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,14 +85,11 @@ class EffectManager{
$index = spl_object_id($effectType); $index = spl_object_id($effectType);
if(isset($this->effects[$index])){ if(isset($this->effects[$index])){
$effect = $this->effects[$index]; $effect = $this->effects[$index];
$hasExpired = $effect->hasExpired();
$ev = new EntityEffectRemoveEvent($this->entity, $effect); $ev = new EntityEffectRemoveEvent($this->entity, $effect);
$ev->call(); $ev->call();
if($ev->isCancelled()){ if($ev->isCancelled()){
if($hasExpired && !$ev->getEffect()->hasExpired()){ //altered duration of an expired effect to make it not get removed foreach($this->effectAddHooks as $hook){
foreach($this->effectAddHooks as $hook){ $hook($ev->getEffect(), true);
$hook($ev->getEffect(), true);
}
} }
return; return;
} }