mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-13 19:25:49 -07:00
@@ -17,8 +17,8 @@
|
||||
|
||||
private static final DataWatcherObject<Integer> a = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
|
||||
@@ -32,6 +41,14 @@
|
||||
private EntityBoat.EnumStatus aH;
|
||||
private double aI;
|
||||
private EntityBoat.EnumStatus aI;
|
||||
private double aJ;
|
||||
|
||||
+ // CraftBukkit start
|
||||
+ // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
|
||||
@@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
protected boolean playStepSound() {
|
||||
@@ -91,6 +109,19 @@
|
||||
@@ -95,6 +113,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);
|
||||
@@ -98,6 +129,15 @@
|
||||
@@ -102,6 +133,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);
|
||||
}
|
||||
@@ -115,9 +155,25 @@
|
||||
@@ -119,9 +159,25 @@
|
||||
public void collide(Entity entity) {
|
||||
if (entity instanceof EntityBoat) {
|
||||
if (entity.getBoundingBox().b < this.getBoundingBox().e) {
|
||||
@@ -101,16 +101,16 @@
|
||||
super.collide(entity);
|
||||
}
|
||||
|
||||
@@ -154,6 +210,8 @@
|
||||
@@ -158,6 +214,8 @@
|
||||
return this.getDirection().e();
|
||||
}
|
||||
|
||||
+ private Location lastLocation; // CraftBukkit
|
||||
+
|
||||
public void m() {
|
||||
this.aH = this.aG;
|
||||
this.aG = this.t();
|
||||
@@ -174,7 +232,6 @@
|
||||
this.aI = this.aH;
|
||||
this.aH = this.t();
|
||||
@@ -178,7 +236,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;
|
||||
@@ -198,6 +255,22 @@
|
||||
@@ -202,6 +259,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);
|
||||
@@ -595,6 +668,11 @@
|
||||
@@ -599,6 +672,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;
|
||||
@@ -608,6 +686,7 @@
|
||||
@@ -612,6 +690,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user