Merge 1.14, and clean up some unused AT entries.

This commit is contained in:
Vincent Lee committed 2020-04-05 00:32:21 -05:00
commit 2eb14c45eb
23 files changed
+211 -51

No files matched your search

@@ -598,7 +598,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp
private void clearPotions(PlayerEntity player) {
List<Effect> potionsToRemove = player.getActivePotionEffects().stream()
.filter(effect -> effect.getDuration() < 160 && effect.isAmbient() && effect.getPotion().type != EffectType.HARMFUL)
.filter(effect -> effect.getDuration() < 160 && effect.isAmbient() && effect.getPotion().getEffectType() != EffectType.HARMFUL)
.map(EffectInstance::getPotion)
.distinct()
.collect(Collectors.toList());