From 5a35e7b058c70856267ac61c1da8953b339ba282 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Tue, 17 Mar 2015 21:08:44 +0100 Subject: [PATCH] Removed damage reduction by armor for lava --- src/pocketmine/block/Lava.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php index 3ca20e864..401e4a3ef 100644 --- a/src/pocketmine/block/Lava.php +++ b/src/pocketmine/block/Lava.php @@ -53,15 +53,8 @@ class Lava extends Liquid{ public function onEntityCollide(Entity $entity){ $entity->fallDistance *= 0.5; - $damage = [EntityDamageEvent::MODIFIER_BASE => 1]; - if($entity instanceof InventoryHolder){ - $inventory = $entity->getInventory(); - if($inventory instanceof PlayerInventory){ - $damage[EntityDamageEvent::MODIFIER_ARMOR] = $inventory->getArmorPoints(); - } - } if(!$entity->hasEffect(Effect::FIRE_RESISTANCE)){ - $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, $damage); + $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4); $entity->attack($ev->getFinalDamage(), $ev); }