From 1d5dfa149e28c97ba6367692ab7e0ea1c9681db8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 21:04:36 -0500 Subject: [PATCH] TIL Collection.removeIf --- .../common/entity/EntityDoppleganger.java | 8 +------- .../common/entity/EntityPinkWither.java | 18 +++--------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 37271f98d..927176a66 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -594,13 +594,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { anyWithArmor = true; Collection active = player.getActivePotionEffects(); - Iterator iter = active.iterator(); - - while (iter.hasNext()) { - PotionEffect effect = iter.next(); - if(effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) - iter.remove(); - } + active.removeIf(effect -> effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()); player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 963754adb..54cbe1b57 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -31,22 +31,10 @@ public class EntityPinkWither extends EntityWither { public EntityPinkWither(World world) { super(world); - Iterator taskIter = this.tasks.taskEntries.iterator(); - while (taskIter.hasNext()) { - EntityAITasks.EntityAITaskEntry entry = taskIter.next(); - if (entry.action instanceof EntityAIAttackRanged) { - taskIter.remove(); // Remove firing wither skulls - } - } + this.tasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIAttackRanged); // Remove firing wither skulls - Iterator targetTaskIter = this.targetTasks.taskEntries.iterator(); - while (targetTaskIter.hasNext()) { - EntityAITasks.EntityAITaskEntry entry = targetTaskIter.next(); - if (entry.action instanceof EntityAIHurtByTarget - || entry.action instanceof EntityAINearestAttackableTarget) { - targetTaskIter.remove(); // Remove revenge and aggro - } - } + this.targetTasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIHurtByTarget + || entry.action instanceof EntityAINearestAttackableTarget); // Remove revenge and aggro } @Override