Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -17,8 +17,8 @@
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
@@ -37,6 +46,14 @@
private float aO;
private float aP;
private float aL;
private float aM;
+ // CraftBukkit start
+ // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
@@ -30,7 +30,7 @@
+
public EntityBoat(EntityTypes<? extends EntityBoat> entitytypes, World world) {
super(entitytypes, world);
this.as = new float[2];
this.ap = new float[2];
@@ -98,6 +115,19 @@
if (damagesource instanceof EntityDamageSourceIndirect && damagesource.getEntity() != null && this.w(damagesource.getEntity())) {
return false;
@@ -94,14 +94,14 @@
}
@@ -176,6 +231,7 @@
return this.getDirection().e();
return this.getDirection().f();
}
+ private Location lastLocation; // CraftBukkit
@Override
public void tick() {
this.aJ = this.aI;
@@ -219,6 +275,22 @@
this.aG = this.aF;
@@ -216,6 +272,22 @@
this.setMot(Vec3D.a);
}
@@ -109,7 +109,7 @@
+ org.bukkit.Server server = this.world.getServer();
+ org.bukkit.World bworld = this.world.getWorld();
+
+ Location to = new Location(bworld, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+ Location to = new Location(bworld, this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+
+ server.getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
@@ -124,7 +124,7 @@
this.q();
for (int i = 0; i <= 1; ++i) {
@@ -740,6 +812,11 @@
@@ -734,6 +806,11 @@
this.b(this.fallDistance, 1.0F);
if (!this.world.isClientSide && !this.dead) {
@@ -136,7 +136,7 @@
this.die();
if (this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {
int i;
@@ -753,6 +830,7 @@
@@ -747,6 +824,7 @@
}
}
}