From 4ad3cdd4b5cfe90f319cfba6c4dabc9bff10a59d Mon Sep 17 00:00:00 2001 From: Jim Bilbrey Date: Wed, 19 Jun 2013 05:38:05 -0400 Subject: [PATCH] Use ambient setting of potion effects. Fixes BUKKIT-4357 and BUKKIT-3653 This changes livingEntity.addPotionEffect(PotionEffect, boolean) to construct the MobEffect using the constructor that includes the ambient setting as supplied by the PotionEffect This also changes livingEntity.getActivePotionEffects() to construct the PotionEffects using the ambient setting supplied by the MobEffects. --- .../java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 3db1b2237d..443dde9195 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -258,7 +258,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } removePotionEffect(effect.getType()); } - getHandle().addEffect(new MobEffect(effect.getType().getId(), effect.getDuration(), effect.getAmplifier())); + getHandle().addEffect(new MobEffect(effect.getType().getId(), effect.getDuration(), effect.getAmplifier(), effect.isAmbient())); return true; } @@ -284,7 +284,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { if (!(raw instanceof MobEffect)) continue; MobEffect handle = (MobEffect) raw; - effects.add(new PotionEffect(PotionEffectType.getById(handle.getEffectId()), handle.getDuration(), handle.getAmplifier())); + effects.add(new PotionEffect(PotionEffectType.getById(handle.getEffectId()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient())); } return effects; }