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

Implemented drowing damage

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-01-26 13:44:38 +01:00
parent ac0fab8f0b
commit f917111f31
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/API/PlayerAPI.php
View File

@ -81,6 +81,9 @@ class PlayerAPI{
case "suffocation":
$message .= " suffocated in a wall";
break;
case "water":
$message .= " drowned";
break;
default:
$message .= " died";
break;

11
src/classes/world/Entity.php
View File

@ -46,6 +46,7 @@ class Entity extends stdClass{
$this->status = 0;
$this->health = 20;
$this->dmgcounter = array(0, 0);
$this->air = 300;
$this->invincible = false;
$this->dead = false;
$this->closed = false;
@ -97,6 +98,14 @@ class Entity extends stdClass{
for($z = $startZ; $z <= $endZ; ++$z){
$b = $this->server->api->level->getBlock($x, $y, $z);
switch($b[0]){
case 8:
case 9: //Drowing
if($this->air <= 0){
$this->harm(2, "water");
}elseif($x == ($endX - 1) and $y == $endY and $z == ($endZ - 1)){
$this->air -= 10;
}
break;
case 10: //Lava damage
case 11:
if($this->inBlock($x, $y, $z)){
@ -116,6 +125,8 @@ class Entity extends stdClass{
default:
if($this->inBlock($x, $y, $z) and !isset(Material::$transparent[$b[0]])){
$this->harm(1, "suffocation"); //Suffocation
}elseif($x == ($endX - 1) and $y == $endY and $z == ($endZ - 1)){
$this->air = 300; //Breathing
}
break;
}