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

Fixed #183 Players taking damage landing on water (temp. fix)

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-05 12:43:18 +02:00
parent 8405c74b42
commit 3d8c9db430
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/world/Entity.php
View File

@ -339,8 +339,9 @@ class Entity extends stdClass{
}elseif($this->fallY !== false){ //Fall damage! }elseif($this->fallY !== false){ //Fall damage!
if($y < $this->fallY){ if($y < $this->fallY){
$d = $this->server->api->block->getBlock(new Vector3($x, $y + 1, $z)); $d = $this->server->api->block->getBlock(new Vector3($x, $y + 1, $z));
$d2 = $this->server->api->block->getBlock(new Vector3($x, $y + 2, $z));
$dmg = ($this->fallY - $y) - 3; $dmg = ($this->fallY - $y) - 3;
if($dmg > 0 and !($d instanceof LiquidBlock) and $d->getID() !== LADDER){ if($dmg > 0 and !($d instanceof LiquidBlock) and $d->getID() !== LADDER and !($d2 instanceof LiquidBlock) and $d2->getID() !== LADDER){
$this->harm($dmg, "fall"); $this->harm($dmg, "fall");
} }
} }