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

Refactor of health int -> float and fixed armor being useless when

Browse Source 
computed damage reduction is less than 1
This commit is contained in:
Dylan K. Taylor
2017-08-30 11:03:07 +01:00
parent ea5bd0348a
commit fd52022065
8 changed files with 61 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,19 +33,19 @@ use pocketmine\entity\Living;
class EntityDamageByEntityEvent extends EntityDamageEvent{
/** @var int */
private $damagerEid;
private $damagerEntityId;
/** @var float */
private $knockBack;
/**
* @param Entity $damager
* @param Entity $entity
* @param int $cause
* @param int|int[] $damage
* @param float $knockBack
* @param Entity $damager
* @param Entity $entity
* @param int $cause
* @param float|float[] $damage
* @param float $knockBack
*/
public function __construct(Entity $damager, Entity $entity, $cause, $damage, $knockBack = 0.4){
$this->damagerEid = $damager->getId();
public function __construct(Entity $damager, Entity $entity, int $cause, $damage, float $knockBack = 0.4){
$this->damagerEntityId = $damager->getId();
$this->knockBack = $knockBack;
parent::__construct($entity, $cause, $damage);
$this->addAttackerModifiers($damager);
@ -69,20 +69,20 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
* @return Entity|null
*/
public function getDamager(){
return $this->getEntity()->getLevel()->getServer()->findEntity($this->damagerEid, $this->getEntity()->getLevel());
return $this->getEntity()->getLevel()->getServer()->findEntity($this->damagerEntityId, $this->getEntity()->getLevel());
}
/**
* @return float
*/
public function getKnockBack(){
public function getKnockBack() : float{
return $this->knockBack;
}
/**
* @param float $knockBack
*/
public function setKnockBack($knockBack){
public function setKnockBack(float $knockBack){
$this->knockBack = $knockBack;
}
}