Update to Minecraft 1.13-pre7

1 files changed, 19 insertions, 19 deletions

diff --git a/nms-patches/EntitySkeletonAbstract.patch b/nms-patches/EntitySkeletonAbstract.patch
index 424cca7c..9b16ed82 100644
--- a/nms-patches/EntitySkeletonAbstract.patch
+++ b/nms-patches/EntitySkeletonAbstract.patch
@@ -1,37 +1,37 @@
 --- a/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/net/minecraft/server/EntitySkeletonAbstract.java
-@@ -2,12 +2,13 @@
- 
- import java.util.Calendar;
+@@ -3,12 +3,13 @@
+ import java.time.LocalDate;
+ import java.time.temporal.ChronoField;
  import javax.annotation.Nullable;
 +import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
  
  public abstract class EntitySkeletonAbstract extends EntityMonster implements IRangedEntity {
  
-     private static final DataWatcherObject<Boolean> a = DataWatcher.a(EntitySkeletonAbstract.class, DataWatcherRegistry.h);
+     private static final DataWatcherObject<Boolean> a = DataWatcher.a(EntitySkeletonAbstract.class, DataWatcherRegistry.i);
      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.p(false);
-@@ -80,7 +81,14 @@
-                 }
+             EntitySkeletonAbstract.this.s(false);
+@@ -78,7 +79,14 @@
+             }
  
-                 if (flag) {
--                    this.setOnFire(8);
-+                    // CraftBukkit start
-+                    EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
-+                    this.world.getServer().getPluginManager().callEvent(event);
+             if (flag) {
+-                this.setOnFire(8);
++                // CraftBukkit start
++                EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
++                this.world.getServer().getPluginManager().callEvent(event);
 +
-+                    if (!event.isCancelled()) {
-+                        this.setOnFire(event.getDuration());
-+                    }
-+                    // CraftBukkit end
-                 }
++                if (!event.isCancelled()) {
++                    this.setOnFire(event.getDuration());
++                }
++                // CraftBukkit end
              }
          }
-@@ -152,8 +160,19 @@
+ 
+@@ -151,8 +159,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));
@@ -46,7 +46,7 @@
 +            world.addEntity(entityarrow);
 +        }
 +        // CraftBukkit end
-         this.a(SoundEffects.gW, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
+         this.a(SoundEffects.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
 -        this.world.addEntity(entityarrow);
 +        // this.world.addEntity(entityarrow); // CraftBukkit - moved up
      }