mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 20:22:12 +00:00
Fix logic issues in killer joe preventing parallel joes from working
This commit is contained in:
1 parent
0f90f4aefe
commit
65dd674a40
1 file changed
+2
-2
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user