From 5e03e157ad991f297ebc35cb666244a89cc346bb Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sat, 4 Oct 2014 23:16:35 +0200 Subject: [PATCH] Fixed #2153 --- src/pocketmine/block/Lava.php | 1 - src/pocketmine/block/StillLava.php | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php index 39a8f4317..d890725ae 100644 --- a/src/pocketmine/block/Lava.php +++ b/src/pocketmine/block/Lava.php @@ -47,7 +47,6 @@ class Lava extends Liquid{ if(!$ev->isCancelled()){ $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){ diff --git a/src/pocketmine/block/StillLava.php b/src/pocketmine/block/StillLava.php index 1faca11ae..a94630050 100644 --- a/src/pocketmine/block/StillLava.php +++ b/src/pocketmine/block/StillLava.php @@ -35,14 +35,4 @@ class StillLava extends Lava{ 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); - } - } \ No newline at end of file