3601ca3da5
Bukkit/CraftBukkit#1145 : @Zarius : Don't fire piston extend event twice Bukkit/CraftBukkit#1174 : @millerkil : Prevent plugins causing ghost players Bukkit/CraftBukkit#1177 : @jb-aero : Properly set ambient flag for potion effects
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
From 183a4c8ebcc8c7b52496fbe4cba25a8bb58e7676 Mon Sep 17 00:00:00 2001
|
|
From: Jim Bilbrey <jb_aero@verizon.net>
|
|
Date: Wed, 19 Jun 2013 05:38:05 -0400
|
|
Subject: [PATCH] Define Ambient Setting of Potion Effects
|
|
|
|
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.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 1d52866..9d9320f 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;
|
|
}
|
|
--
|
|
1.8.1.2
|
|
|