summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityAreaEffectCloud.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
committermd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
commitc5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch)
tree9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityAreaEffectCloud.patch
parent4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff)
downloadcraftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityAreaEffectCloud.patch')
-rw-r--r--nms-patches/EntityAreaEffectCloud.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/EntityAreaEffectCloud.patch b/nms-patches/EntityAreaEffectCloud.patch
index 08cb2e41..2da2e1c5 100644
--- a/nms-patches/EntityAreaEffectCloud.patch
+++ b/nms-patches/EntityAreaEffectCloud.patch
@@ -9,15 +9,15 @@
+import org.bukkit.entity.LivingEntity; // CraftBukkit
+
import java.util.Map.Entry;
+ import javax.annotation.Nullable;
- public class EntityAreaEffectCloud extends Entity {
-@@ -91,6 +95,22 @@
+@@ -92,6 +96,22 @@
}
+ // CraftBukkit start accessor methods
+ public void refreshEffects() {
-+ if (!this.au) {
++ if (!this.hasColor) {
+ this.getDataWatcher().set(EntityAreaEffectCloud.b, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.e, (Collection) this.effects)))); // PAIL: rename
+ }
+ }
@@ -34,7 +34,7 @@
public int getColor() {
return ((Integer) this.getDataWatcher().get(EntityAreaEffectCloud.b)).intValue();
}
-@@ -237,6 +257,7 @@
+@@ -238,6 +258,7 @@
if (!list.isEmpty()) {
Iterator iterator2 = list.iterator();
@@ -42,7 +42,7 @@
while (iterator2.hasNext()) {
EntityLiving entityliving = (EntityLiving) iterator2.next();
-@@ -246,6 +267,17 @@
+@@ -247,6 +268,17 @@
double d2 = d0 * d0 + d1 * d1;
if (d2 <= (double) (f * f)) {