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

Move a whole bunch of packet crap to NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-04-02 18:31:16 +01:00
parent 2c4f2810d2
commit e5756dbf0b
6 changed files with 308 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/entity/Living.php
View File

@ -228,14 +228,14 @@ abstract class Living extends Entity implements Damageable{
$ev->call();
if($ev->isCancelled()){
if($hasExpired and !$ev->getEffect()->hasExpired()){ //altered duration of an expired effect to make it not get removed
$this->sendEffectAdd($ev->getEffect(), true);
$this->onEffectAdded($ev->getEffect(), true);
}
return;
}
unset($this->effects[$index]);
$effect->getType()->remove($this, $effect);
$this->sendEffectRemove($effect);
$this->onEffectRemoved($effect);
$this->recalculateEffectColor();
}
@ -310,7 +310,7 @@ abstract class Living extends Entity implements Damageable{
}
$effect->getType()->add($this, $effect);
$this->sendEffectAdd($effect, $oldEffect !== null);
$this->onEffectAdded($effect, $oldEffect !== null);
$this->effects[$index] = $effect;
@ -368,11 +368,11 @@ abstract class Living extends Entity implements Damageable{
}
}
protected function sendEffectAdd(EffectInstance $effect, bool $replacesOldEffect) : void{
protected function onEffectAdded(EffectInstance $effect, bool $replacesOldEffect) : void{
}
protected function sendEffectRemove(EffectInstance $effect) : void{
protected function onEffectRemoved(EffectInstance $effect) : void{
}