Update to Minecraft 1.10

1 files changed, 6 insertions, 6 deletions

diff --git a/nms-patches/EntityAreaEffectCloud.patch b/nms-patches/EntityAreaEffectCloud.patch
index 2da2e1c5..21252917 100644
--- a/nms-patches/EntityAreaEffectCloud.patch
+++ b/nms-patches/EntityAreaEffectCloud.patch
@@ -11,19 +11,19 @@
  import java.util.Map.Entry;
  import javax.annotation.Nullable;
  
-@@ -92,6 +96,22 @@
+@@ -96,6 +100,22 @@
  
      }
  
 +    // CraftBukkit start accessor methods
 +    public void refreshEffects() {
 +        if (!this.hasColor) {
-+            this.getDataWatcher().set(EntityAreaEffectCloud.b, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.e, (Collection) this.effects)))); // PAIL: rename
++            this.getDataWatcher().set(EntityAreaEffectCloud.b, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects)))); // PAIL: rename
 +        }
 +    }
 +
 +    public String getType() {
-+        return ((MinecraftKey) PotionRegistry.a.b(this.e)).toString(); // PAIL: rename
++        return ((MinecraftKey) PotionRegistry.a.b(this.potionRegistry)).toString(); // PAIL: rename
 +    }
 +
 +    public void setType(String string) {
@@ -34,7 +34,7 @@
      public int getColor() {
          return ((Integer) this.getDataWatcher().get(EntityAreaEffectCloud.b)).intValue();
      }
-@@ -238,6 +258,7 @@
+@@ -265,6 +285,7 @@
                      if (!list.isEmpty()) {
                          Iterator iterator2 = list.iterator();
  
@@ -42,7 +42,7 @@
                          while (iterator2.hasNext()) {
                              EntityLiving entityliving = (EntityLiving) iterator2.next();
  
-@@ -247,6 +268,17 @@
+@@ -274,6 +295,17 @@
                                  double d2 = d0 * d0 + d1 * d1;
  
                                  if (d2 <= (double) (f * f)) {
@@ -57,6 +57,6 @@
 +                                if (entity instanceof CraftLivingEntity) {
 +                                    EntityLiving entityliving = ((CraftLivingEntity) entity).getHandle();
 +                                    // CraftBukkit end
-                                     this.g.put(entityliving, Integer.valueOf(this.ticksLived + this.reapplicationDelay));
+                                     this.au.put(entityliving, Integer.valueOf(this.ticksLived + this.reapplicationDelay));
                                      Iterator iterator3 = arraylist.iterator();