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

Use entity IDs in EntityDamageBy*EntityEvents, fixed memory leaks related to PvP/PvE/PvM (#418)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-03-13 10:30:31 +00:00
committed by GitHub
parent 083d1e9ef8
commit 92193fd27b
8 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/event/entity/EntityDamageByEntityEvent.php
View File

@ -24,10 +24,13 @@ namespace pocketmine\event\entity;
use pocketmine\entity\Effect;
use pocketmine\entity\Entity;
/**
* Called when an entity takes damage from another entity.
*/
class EntityDamageByEntityEvent extends EntityDamageEvent{
/** @var Entity */
private $damager;
/** @var int */
private $damagerEid;
/** @var float */
private $knockBack;
@ -39,7 +42,7 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
* @param float $knockBack
*/
public function __construct(Entity $damager, Entity $entity, $cause, $damage, $knockBack = 0.4){
$this->damager = $damager;
$this->damagerEid = $damager->getId();
$this->knockBack = $knockBack;
parent::__construct($entity, $cause, $damage);
$this->addAttackerModifiers($damager);
@ -56,10 +59,12 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
}
/**
* @return Entity
* Returns the attacking entity, or null if the attacker has been killed or closed.
*
* @return Entity|null
*/
public function getDamager(){
return $this->damager;
return $this->getEntity()->getLevel()->getServer()->findEntity($this->damagerEid, $this->getEntity()->getLevel());
}
/**