OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use ambient setting of potion effects. Fixes BUKKIT-4357 and BUKKIT-3653

Browse source 
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.
This commit is contained in:
Jim Bilbrey 2013-06-19 05:38:05 -04:00 committed by h31ix
parent cebc247b78
commit 4ad3cdd4b5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View file

@ -258,7 +258,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
} }
removePotionEffect(effect.getType()); 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; return true;
} }
@ -284,7 +284,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (!(raw instanceof MobEffect)) if (!(raw instanceof MobEffect))
continue; continue;
MobEffect handle = (MobEffect) raw; 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; return effects;
} }