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

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

13
src/pocketmine/event/entity/EntityDamageEvent.php
View File

@ -37,6 +37,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
const MODIFIER_STRENGTH = 2;
const MODIFIER_WEAKNESS = 3;
const MODIFIER_RESISTANCE = 4;
const MODIFIER_ABSORPTION = 5;
const CAUSE_CONTACT = 0;
const CAUSE_ENTITY_ATTACK = 1;
@ -99,11 +100,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
* @return float
*/
public function getOriginalDamage(int $type = self::MODIFIER_BASE) : float{
if(isset($this->originals[$type])){
return $this->originals[$type];
}
return 0.0;
return $this->originals[$type] ?? 0.0;
}
/**
@ -112,11 +109,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
* @return float
*/
public function getDamage(int $type = self::MODIFIER_BASE) : float{
if(isset($this->modifiers[$type])){
return $this->modifiers[$type];
}
return 0.0;
return $this->modifiers[$type] ?? 0.0;
}
/**