From 65dd674a40072f5029d887cd8fe89a90d27fa6dd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Mar 2015 08:00:29 -0500 Subject: [PATCH] Fix logic issues in killer joe preventing parallel joes from working --- .../crazypants/enderio/machine/killera/TileKillerJoe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index b4043925..147310ac 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -171,7 +171,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle if(!entsInBounds.isEmpty()) { for (EntityLivingBase ent : entsInBounds) { - if(!ent.isDead && ent.deathTime <= 0 && !ent.isEntityInvulnerable()) { + if(!ent.isDead && ent.deathTime <= 0 && !ent.isEntityInvulnerable() && ent.hurtResistantTime == 0) { if (ent instanceof EntityPlayer && ((EntityPlayer)ent).capabilities.disableDamage) continue; //Ignore players in creative, can't damage them; if (Config.killerJoeMustSee && !canJoeSee(ent)) continue; FakePlayer fakee = getAttackera(); @@ -182,8 +182,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle if(getStackInSlot(0).stackSize <= 0 || fakee.getCurrentEquippedItem() == null) { setInventorySlotContents(0, null); } + return false; } - return false; } } return false;