mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
23 lines
1.5 KiB
Diff
23 lines
1.5 KiB
Diff
--- a/net/minecraft/world/effect/MobEffectUtil.java
|
|
+++ b/net/minecraft/world/effect/MobEffectUtil.java
|
|
@@ -44,13 +44,19 @@
|
|
}
|
|
|
|
public static List<EntityPlayer> addEffectToPlayersAround(WorldServer worldserver, @Nullable Entity entity, Vec3D vec3d, double d0, MobEffect mobeffect, int i) {
|
|
+ // CraftBukkit start
|
|
+ return addEffectToPlayersAround(worldserver, entity, vec3d, d0, mobeffect, i, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.UNKNOWN);
|
|
+ }
|
|
+
|
|
+ public static List<EntityPlayer> addEffectToPlayersAround(WorldServer worldserver, @Nullable Entity entity, Vec3D vec3d, double d0, MobEffect mobeffect, int i, org.bukkit.event.entity.EntityPotionEffectEvent.Cause cause) {
|
|
+ // CraftBukkit end
|
|
MobEffectList mobeffectlist = mobeffect.getEffect();
|
|
List<EntityPlayer> list = worldserver.getPlayers((entityplayer) -> {
|
|
return entityplayer.gameMode.isSurvival() && (entity == null || !entity.isAlliedTo((Entity) entityplayer)) && vec3d.closerThan(entityplayer.position(), d0) && (!entityplayer.hasEffect(mobeffectlist) || entityplayer.getEffect(mobeffectlist).getAmplifier() < mobeffect.getAmplifier() || entityplayer.getEffect(mobeffectlist).getDuration() < i);
|
|
});
|
|
|
|
list.forEach((entityplayer) -> {
|
|
- entityplayer.addEffect(new MobEffect(mobeffect), entity);
|
|
+ entityplayer.addEffect(new MobEffect(mobeffect), entity, cause); // CraftBukkit
|
|
});
|
|
return list;
|
|
}
|