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

Added suffocation, drowning damage. Closes #1908

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-09-16 11:51:31 +02:00
parent 3ba099b309
commit f0e7713dce
5 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,27 @@ abstract class Living extends Entity implements Damageable{
Timings::$timerEntityBaseTick->startTiming();
parent::entityBaseTick();
if($this->dead !== true and $this->isInsideOfSolid()){
$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 1));
if(!$ev->isCancelled()){
$this->attack($ev->getFinalDamage(), $ev);
}
}
if($this->dead !== true and $this->isInsideOfWater()){
--$this->airTicks;
if($this->airTicks <= -20){
$this->airTicks = 0;
$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_DROWNING, 2));
if(!$ev->isCancelled()){
$this->attack($ev->getFinalDamage(), $ev);
}
}
$this->extinguish();
}
if($this->attackTime > 0){
--$this->attackTime;
}