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

Merge branch 'php/7.0' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-03 15:02:41 +01:00
parent f077ba4748 815c697767
commit 78d49f8e66
16 changed files with 108 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pocketmine/entity/Entity.php
View File

@ -212,6 +212,7 @@ abstract class Entity extends Location implements Metadatable{
public static $entityCount = 1;
/** @var Entity[] */
private static $knownEntities = [];
/** @var string[] */
private static $shortNames = [];
public static function init(){
@ -901,21 +902,7 @@ abstract class Entity extends Location implements Metadatable{
$this->setLastDamageCause($source);
$damage = $source->getFinalDamage();
$absorption = $this->getAbsorption();
if($absorption > 0){
if($absorption > $damage){
//Use absorption health before normal health.
$this->setAbsorption($absorption - $damage);
$damage = 0;
}else{
$this->setAbsorption(0);
$damage -= $absorption;
}
}
$this->setHealth($this->getHealth() - $damage);
$this->setHealth($this->getHealth() - $source->getFinalDamage());
}
/**
@ -962,14 +949,6 @@ abstract class Entity extends Location implements Metadatable{
}
}
public function getAbsorption() : float{
return 0;
}
public function setAbsorption(float $absorption){
}
/**
* @param EntityDamageEvent $type
*/