Minecraft 1.9.4

By: md_5 <git@md-5.net>

paper-server/nms-patches/EntityBoat.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/EntityBoat.java
 +++ b/net/minecraft/server/EntityBoat.java
-@@ -4,6 +4,15 @@
- import java.util.ArrayList;
+@@ -5,6 +5,15 @@
  import java.util.List;
+ import javax.annotation.Nullable;
  
 +// CraftBukkit start
 +import org.bukkit.Location;
@@ -16,9 +16,9 @@
  public class EntityBoat extends Entity {
  
      private static final DataWatcherObject<Integer> a = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
-@@ -31,6 +40,14 @@
-     private EntityBoat.EnumStatus aG;
-     private double aH;
+@@ -32,6 +41,14 @@
+     private EntityBoat.EnumStatus aH;
+     private double aI;
  
 +    // CraftBukkit start
 +    // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
@@ -31,7 +31,7 @@
      public EntityBoat(World world) {
          super(world);
          this.f = new float[2];
-@@ -47,6 +64,7 @@
+@@ -48,6 +65,7 @@
          this.lastX = d0;
          this.lastY = d1;
          this.lastZ = d2;
@@ -39,7 +39,7 @@
      }
  
      protected boolean playStepSound() {
-@@ -88,6 +106,19 @@
+@@ -91,6 +109,19 @@
              if (damagesource instanceof EntityDamageSourceIndirect && damagesource.getEntity() != null && this.w(damagesource.getEntity())) {
                  return false;
              } else {
@@ -59,7 +59,7 @@
                  this.d(-this.q());
                  this.b(10);
                  this.setDamage(this.n() + f * 10.0F);
-@@ -95,6 +126,15 @@
+@@ -98,6 +129,15 @@
                  boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
  
                  if (flag || this.n() > 40.0F) {
@@ -75,7 +75,7 @@
                      if (!flag && this.world.getGameRules().getBoolean("doEntityDrops")) {
                          this.a(this.j(), 1, 0.0F);
                      }
-@@ -112,9 +152,25 @@
+@@ -115,9 +155,25 @@
      public void collide(Entity entity) {
          if (entity instanceof EntityBoat) {
              if (entity.getBoundingBox().b < this.getBoundingBox().e) {
@@ -101,16 +101,16 @@
              super.collide(entity);
          }
  
-@@ -151,6 +207,8 @@
+@@ -154,6 +210,8 @@
          return this.getDirection().e();
      }
  
 +    private Location lastLocation; // CraftBukkit
 +
      public void m() {
-         this.aG = this.aF;
-         this.aF = this.t();
-@@ -171,7 +229,6 @@
+         this.aH = this.aG;
+         this.aG = this.t();
+@@ -174,7 +232,6 @@
          if (this.n() > 0.0F) {
              this.setDamage(this.n() - 1.0F);
          }
@@ -118,7 +118,7 @@
          this.lastX = this.locX;
          this.lastY = this.locY;
          this.lastZ = this.locZ;
-@@ -195,6 +252,22 @@
+@@ -198,6 +255,22 @@
              this.motZ = 0.0D;
          }
  
@@ -141,7 +141,7 @@
          for (int i = 0; i <= 1; ++i) {
              if (this.a(i)) {
                  this.f[i] = (float) ((double) this.f[i] + 0.01D);
-@@ -591,6 +664,11 @@
+@@ -595,6 +668,11 @@
  
                      this.e(this.fallDistance, 1.0F);
                      if (!this.world.isClientSide && !this.dead) {
@@ -153,7 +153,7 @@
                          this.die();
                          if (this.world.getGameRules().getBoolean("doEntityDrops")) {
                              int i;
-@@ -604,6 +682,7 @@
+@@ -608,6 +686,7 @@
                              }
                          }
                      }