Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/vehicle/EntityBoat.java
+++ b/net/minecraft/world/entity/vehicle/EntityBoat.java
@@ -55,6 +55,15 @@
@@ -54,6 +54,15 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.VoxelShapes;
import org.joml.Vector3f;
+// CraftBukkit start
+import org.bukkit.Location;
@@ -16,7 +16,7 @@
public class EntityBoat extends VehicleEntity implements VariantHolder<EntityBoat.EnumBoatType> {
private static final DataWatcherObject<Integer> DATA_ID_TYPE = DataWatcher.defineId(EntityBoat.class, DataWatcherRegistry.INT);
@@ -92,6 +101,14 @@
@@ -91,6 +100,14 @@
private float bubbleAngle;
private float bubbleAngleO;
@@ -31,7 +31,7 @@
public EntityBoat(EntityTypes<? extends EntityBoat> entitytypes, World world) {
super(entitytypes, world);
this.paddlePositions = new float[2];
@@ -192,9 +209,29 @@
@@ -186,9 +203,29 @@
public void push(Entity entity) {
if (entity instanceof EntityBoat) {
if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
@@ -61,7 +61,7 @@
super.push(entity);
}
@@ -288,6 +325,7 @@
@@ -282,6 +319,7 @@
return this.getDirection().getClockWise();
}
@@ -69,7 +69,7 @@
@Override
public void tick() {
this.oldStatus = this.status;
@@ -328,6 +366,22 @@
@@ -322,6 +360,22 @@
this.setDeltaMovement(Vec3D.ZERO);
}
@@ -92,7 +92,7 @@
this.tickBubbleColumn();
for (int i = 0; i <= 1; ++i) {
@@ -813,6 +867,11 @@
@@ -811,6 +865,11 @@
this.causeFallDamage(this.fallDistance, 1.0F, this.damageSources().fall());
if (!this.level().isClientSide && !this.isRemoved()) {
@@ -104,7 +104,7 @@
this.kill();
if (this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
int i;
@@ -826,6 +885,7 @@
@@ -824,6 +883,7 @@
}
}
}