Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-19 13:00:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen 
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.
Dieser Commit ist enthalten in:
Jim Bilbrey 2013-06-19 05:38:05 -04:00 committet von h31ix
Ursprung cebc247b78
Commit 4ad3cdd4b5
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
Datei anzeigen

@ -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;
} }