Update to Minecraft 1.10

1 files changed, 5 insertions, 14 deletions

diff --git a/nms-patches/EntityTippedArrow.patch b/nms-patches/EntityTippedArrow.patch
index 135274da..145287c6 100644
--- a/nms-patches/EntityTippedArrow.patch
+++ b/nms-patches/EntityTippedArrow.patch
@@ -1,34 +1,25 @@
 --- a/net/minecraft/server/EntityTippedArrow.java
 +++ b/net/minecraft/server/EntityTippedArrow.java
-@@ -10,7 +10,7 @@
- 
-     private static final DataWatcherObject<Integer> f = DataWatcher.a(EntityTippedArrow.class, DataWatcherRegistry.b);
-     private PotionRegistry g;
--    private final Set<MobEffect> h;
-+    public final Set<MobEffect> h; // CraftBukkit private -> public
- 
-     public EntityTippedArrow(World world) {
-         super(world);
 @@ -98,6 +98,25 @@
          }
      }
  
 +    // CraftBukkit start accessor methods
 +    public void refreshEffects() {
-+        this.getDataWatcher().set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.g, (Collection) this.h)))); // PAIL: rename
++        this.getDataWatcher().set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
 +    }
 +
 +    public String getType() {
-+        return ((MinecraftKey) PotionRegistry.a.b(this.g)).toString();
++        return ((MinecraftKey) PotionRegistry.a.b(this.potionRegistry)).toString();
 +    }
 +
 +    public void setType(String string) {
-+        this.g = PotionRegistry.a.get(new MinecraftKey(string));
-+        this.datawatcher.set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.g, (Collection) this.h)))); // PAIL: rename
++        this.potionRegistry = PotionRegistry.a.get(new MinecraftKey(string));
++        this.datawatcher.set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
 +    }
 +
 +    public boolean isTipped() {
-+        return !(this.h.isEmpty() && this.g == Potions.a); // PAIL: rename
++        return !(this.effects.isEmpty() && this.potionRegistry == Potions.a); // PAIL: rename
 +    }
 +    // CraftBukkit end
 +