Update to Minecraft 1.12-pre2

1 files changed, 4 insertions, 21 deletions

diff --git a/nms-patches/EntitySkeletonAbstract.patch b/nms-patches/EntitySkeletonAbstract.patch
index db96e176..424cca7c 100644
--- a/nms-patches/EntitySkeletonAbstract.patch
+++ b/nms-patches/EntitySkeletonAbstract.patch
@@ -9,12 +9,12 @@
  public abstract class EntitySkeletonAbstract extends EntityMonster implements IRangedEntity {
  
      private static final DataWatcherObject<Boolean> a = DataWatcher.a(EntitySkeletonAbstract.class, DataWatcherRegistry.h);
-     private final PathfinderGoalBowShoot b = new PathfinderGoalBowShoot(this, 1.0D, 20, 15.0F);
+     private final PathfinderGoalBowShoot<EntitySkeletonAbstract> b = new PathfinderGoalBowShoot(this, 1.0D, 20, 15.0F);
 -    private final PathfinderGoalMeleeAttack c = new PathfinderGoalMeleeAttack(this, 1.2D, flag) {
 +    private final PathfinderGoalMeleeAttack c = new PathfinderGoalMeleeAttack(this, 1.2D, false) { // CraftBukkit - decompile error
          public void d() {
              super.d();
-             EntitySkeletonAbstract.this.a(false);
+             EntitySkeletonAbstract.this.p(false);
 @@ -80,7 +81,14 @@
                  }
  
@@ -31,24 +31,7 @@
                  }
              }
          }
-@@ -99,7 +107,7 @@
-     }
- 
-     public void die(DamageSource damagesource) {
--        super.die(damagesource);
-+        // super.die(damagesource); // CraftBukkit
-         if (damagesource.i() instanceof EntityArrow && damagesource.getEntity() instanceof EntityHuman) {
-             EntityHuman entityhuman = (EntityHuman) damagesource.getEntity();
-             double d0 = entityhuman.locX - this.locX;
-@@ -109,6 +117,7 @@
-                 entityhuman.b((Statistic) AchievementList.v);
-             }
-         }
-+        super.die(damagesource); // CraftBukkit - moved from above
- 
-     }
- 
-@@ -166,8 +175,19 @@
+@@ -152,8 +160,19 @@
          double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
  
          entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
@@ -63,7 +46,7 @@
 +            world.addEntity(entityarrow);
 +        }
 +        // CraftBukkit end
-         this.a(SoundEffects.fV, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
+         this.a(SoundEffects.gW, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
 -        this.world.addEntity(entityarrow);
 +        // this.world.addEntity(entityarrow); // CraftBukkit - moved up
      }