@@ -17,8 +17,8 @@
|
||||
|
||||
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
|
||||
@@ -38,6 +47,14 @@
|
||||
private float aK;
|
||||
private float aL;
|
||||
private float aD;
|
||||
private float aE;
|
||||
|
||||
+ // CraftBukkit start
|
||||
+ // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
|
||||
@@ -30,8 +30,8 @@
|
||||
+
|
||||
public EntityBoat(EntityTypes<? extends EntityBoat> entitytypes, World world) {
|
||||
super(entitytypes, world);
|
||||
this.ao = new float[2];
|
||||
@@ -101,6 +118,19 @@
|
||||
this.ah = new float[2];
|
||||
@@ -108,6 +125,19 @@
|
||||
if (this.isInvulnerable(damagesource)) {
|
||||
return false;
|
||||
} else if (!this.world.isClientSide && !this.dead) {
|
||||
@@ -51,7 +51,7 @@
|
||||
this.c(-this.o());
|
||||
this.b(10);
|
||||
this.setDamage(this.getDamage() + f * 10.0F);
|
||||
@@ -108,6 +138,15 @@
|
||||
@@ -115,6 +145,15 @@
|
||||
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
|
||||
|
||||
if (flag || this.getDamage() > 40.0F) {
|
||||
@@ -67,7 +67,7 @@
|
||||
if (!flag && this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {
|
||||
this.a((IMaterial) this.g());
|
||||
}
|
||||
@@ -142,9 +181,29 @@
|
||||
@@ -149,9 +188,29 @@
|
||||
public void collide(Entity entity) {
|
||||
if (entity instanceof EntityBoat) {
|
||||
if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
|
||||
@@ -97,15 +97,15 @@
|
||||
super.collide(entity);
|
||||
}
|
||||
|
||||
@@ -178,6 +237,7 @@
|
||||
@@ -185,6 +244,7 @@
|
||||
return this.getDirection().g();
|
||||
}
|
||||
|
||||
+ private Location lastLocation; // CraftBukkit
|
||||
@Override
|
||||
public void tick() {
|
||||
this.aF = this.aE;
|
||||
@@ -218,6 +278,22 @@
|
||||
this.ay = this.ax;
|
||||
@@ -225,6 +285,22 @@
|
||||
this.setMot(Vec3D.a);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user