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

Fixed #2153

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-04 23:16:35 +02:00
parent b0c40dc1ab
commit 5e03e157ad
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ class Lava extends Liquid{
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$entity->attack($ev->getFinalDamage(), $ev); $entity->attack($ev->getFinalDamage(), $ev);
} }
$entity->attack(4, EntityDamageEvent::CAUSE_LAVA);
} }
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){

10
src/pocketmine/block/StillLava.php
View File

@ -35,14 +35,4 @@ class StillLava extends Lava{
return null; return null;
} }
public function onEntityCollide(Entity $entity){
$entity->setOnFire(15);
$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_LAVA, 4);
Server::getInstance()->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){
$entity->attack($ev->getFinalDamage(), $ev);
}
$entity->attack(4, EntityDamageEvent::CAUSE_LAVA);
}
} }