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

Updated Water/Lava to use new methods

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-03-17 21:22:51 +01:00
parent 5a35e7b058
commit 8169803bb4
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/block/Lava.php
View File

@ -21,6 +21,7 @@
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\entity\Effect;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityCombustByBlockEvent; use pocketmine\event\entity\EntityCombustByBlockEvent;
use pocketmine\event\entity\EntityDamageByBlockEvent; use pocketmine\event\entity\EntityDamageByBlockEvent;
@ -64,9 +65,7 @@ class Lava extends Liquid{
$entity->setOnFire($ev->getDuration()); $entity->setOnFire($ev->getDuration());
} }
if($entity instanceof Player){ $entity->resetFallDistance();
$entity->onGround = true;
}
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

4
src/pocketmine/block/Water.php
View File

@ -47,9 +47,7 @@ class Water extends Liquid{
$entity->extinguish(); $entity->extinguish();
} }
if($entity instanceof Player){ $entity->resetFallDistance();
$entity->onGround = true;
}
} }
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){