From 72026dd1c593937fa1344dc0c75fa3f30ca994fb Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 21 Mar 2015 11:31:51 -0500 Subject: [PATCH] Lasers now dynamically damage entities based on energy output --- src/main/java/mekanism/common/LaserManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 0836807cb..08a6718ea 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -6,11 +6,11 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -49,7 +49,11 @@ public class LaserManager for(Entity e : (List)world.getEntitiesWithinAABB(Entity.class, Pos3D.getAABB(from, to))) { - if(!e.isImmuneToFire()) e.setFire((int)(energy / 1000)); + if(!e.isImmuneToFire()) + { + e.setFire((int)(energy / 1000)); + e.attackEntityFrom(DamageSource.onFire, (float)energy/1000F); + } } return mop;