SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityBoat.patch → paper-server/nms-patches/net/minecraft/world/entity/vehicle/AbstractBoat.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/EntityBoat.java
+++ b/net/minecraft/world/entity/vehicle/EntityBoat.java
@@ -55,6 +55,16 @@
--- a/net/minecraft/world/entity/vehicle/AbstractBoat.java
+++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java
@@ -48,6 +48,15 @@
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.VoxelShapes;
@@ -9,17 +9,16 @@
+import org.bukkit.craftbukkit.util.CraftLocation;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.entity.EntityRemoveEvent;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+// CraftBukkit end
+
public class EntityBoat extends VehicleEntity implements Leashable, VariantHolder<EntityBoat.EnumBoatType> {
public abstract class AbstractBoat extends VehicleEntity implements Leashable {
private static final DataWatcherObject<Integer> DATA_ID_TYPE = DataWatcher.defineId(EntityBoat.class, DataWatcherRegistry.INT);
@@ -94,6 +104,14 @@
@Nullable
private static final DataWatcherObject<Boolean> DATA_ID_PADDLE_LEFT = DataWatcher.defineId(AbstractBoat.class, DataWatcherRegistry.BOOLEAN);
@@ -87,6 +96,14 @@
private Leashable.a leashData;
private final Supplier<Item> dropItem;
+ // CraftBukkit start
+ // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
@@ -29,12 +28,12 @@
+ public boolean landBoats = false;
+ // CraftBukkit end
+
public EntityBoat(EntityTypes<? extends EntityBoat> entitytypes, World world) {
public AbstractBoat(EntityTypes<? extends AbstractBoat> entitytypes, World world, Supplier<Item> supplier) {
super(entitytypes, world);
this.paddlePositions = new float[2];
@@ -189,9 +207,29 @@
this.dropItem = supplier;
@@ -182,9 +199,29 @@
public void push(Entity entity) {
if (entity instanceof EntityBoat) {
if (entity instanceof AbstractBoat) {
if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
+ // CraftBukkit start
+ if (!this.isPassengerOfSameVehicle(entity)) {
@@ -62,7 +61,7 @@
super.push(entity);
}
@@ -285,6 +323,7 @@
@@ -247,6 +284,7 @@
return this.getDirection().getClockWise();
}
@@ -70,7 +69,7 @@
@Override
public void tick() {
this.oldStatus = this.status;
@@ -325,6 +364,22 @@
@@ -287,6 +325,21 @@
this.setDeltaMovement(Vec3D.ZERO);
}
@@ -89,11 +88,10 @@
+ }
+ lastLocation = vehicle.getLocation();
+ // CraftBukkit end
+
this.applyEffectsFromBlocks();
this.applyEffectsFromBlocks();
this.tickBubbleColumn();
for (int i = 0; i <= 1; ++i) {
@@ -837,11 +892,18 @@
@@ -790,11 +843,18 @@
@Override
public void remove(Entity.RemovalReason entity_removalreason) {
@@ -113,23 +111,3 @@
}
@Override
@@ -857,6 +919,11 @@
this.causeFallDamage(this.fallDistance, 1.0F, this.damageSources().fall());
if (!this.level().isClientSide && !this.isRemoved()) {
+ // CraftBukkit start
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, null);
+ this.level().getCraftServer().getPluginManager().callEvent(destroyEvent);
+ if (!destroyEvent.isCancelled()) {
this.kill();
if (this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
int i;
@@ -870,6 +937,7 @@
}
}
}
+ } // CraftBukkit end
}
this.resetFallDistance();

12
paper-server/nms-patches/net/minecraft/world/entity/vehicle/ChestBoat.patch → paper-server/nms-patches/net/minecraft/world/entity/vehicle/AbstractChestBoat.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/ChestBoat.java
+++ b/net/minecraft/world/entity/vehicle/ChestBoat.java
@@ -26,6 +26,15 @@
--- a/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
+++ b/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
@@ -27,6 +27,15 @@
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.storage.loot.LootTable;
@@ -13,10 +13,10 @@
+import org.bukkit.inventory.InventoryHolder;
+// CraftBukkit end
+
public class ChestBoat extends EntityBoat implements HasCustomInventoryScreen, ContainerEntity {
public abstract class AbstractChestBoat extends AbstractBoat implements HasCustomInventoryScreen, ContainerEntity {
private static final int CONTAINER_SIZE = 27;
@@ -78,11 +87,18 @@
@@ -70,11 +79,18 @@
@Override
public void remove(Entity.RemovalReason entity_removalreason) {
@@ -36,7 +36,7 @@
}
@Override
@@ -248,4 +264,51 @@
@@ -212,4 +228,51 @@
public void stopOpen(EntityHuman entityhuman) {
this.level().gameEvent((Holder) GameEvent.CONTAINER_CLOSE, this.position(), GameEvent.a.of((Entity) entityhuman));
}

142
paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java
+++ b/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java
@@ -47,6 +47,14 @@
@@ -43,6 +43,14 @@
import net.minecraft.world.phys.AxisAlignedBB;
import net.minecraft.world.phys.Vec3D;
@@ -15,7 +15,7 @@
public abstract class EntityMinecartAbstract extends VehicleEntity {
private static final Vec3D LOWERED_PASSENGER_ATTACHMENT = new Vec3D(0.0D, 0.0D, 0.0D);
@@ -86,6 +94,17 @@
@@ -76,6 +84,17 @@
enummap.put(BlockPropertyTrackPosition.NORTH_EAST, Pair.of(baseblockposition2, baseblockposition1));
});
@@ -32,17 +32,17 @@
+
protected EntityMinecartAbstract(EntityTypes<?> entitytypes, World world) {
super(entitytypes, world);
this.targetDeltaMovement = Vec3D.ZERO;
@@ -126,7 +145,7 @@
object = new EntityMinecartRideable(worldserver, d0, d1, d2);
}
this.blocksBuilding = true;
@@ -101,7 +120,7 @@
- Object object1 = object;
+ EntityMinecartAbstract object1 = (EntityMinecartAbstract) object; // CraftBukkit- decompile error
@Nullable
public static <T extends EntityMinecartAbstract> T createMinecart(World world, double d0, double d1, double d2, EntityTypes<T> entitytypes, EntitySpawnReason entityspawnreason, ItemStack itemstack, @Nullable EntityHuman entityhuman) {
- T t0 = (EntityMinecartAbstract) entitytypes.create(world, entityspawnreason);
+ T t0 = (T) entitytypes.create(world, entityspawnreason); // CraftBukkit - decompile error
EntityTypes.createDefaultStackConfig(worldserver, itemstack, entityhuman).accept(object1);
return (EntityMinecartAbstract) object1;
@@ -270,6 +289,14 @@
if (t0 != null) {
t0.setInitialPos(d0, d1, d2);
@@ -262,6 +281,14 @@
@Override
public void tick() {
@@ -57,86 +57,29 @@
if (this.getHurtTime() > 0) {
this.setHurtTime(this.getHurtTime() - 1);
}
@@ -279,7 +306,7 @@
@@ -271,8 +298,20 @@
}
this.checkBelowWorld();
- this.handlePortal();
+ // this.handlePortal(); // CraftBukkit - handled in postTick
if (this.level().isClientSide) {
if (this.lerpSteps > 0) {
this.lerpPositionAndRotationStep(this.lerpSteps, this.lerpX, this.lerpY, this.lerpZ, this.lerpYRot, this.lerpXRot);
@@ -332,6 +359,18 @@
}
this.setRot(this.getYRot(), this.getXRot());
+ // CraftBukkit start
+ org.bukkit.World bworld = this.level().getWorld();
+ Location from = new Location(bworld, prevX, prevY, prevZ, prevYaw, prevPitch);
+ Location to = CraftLocation.toBukkit(this.position(), bworld, this.getYRot(), this.getXRot());
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
this.behavior.tick();
+ // CraftBukkit start
+ org.bukkit.World bworld = this.level().getWorld();
+ Location from = new Location(bworld, prevX, prevY, prevZ, prevYaw, prevPitch);
+ Location to = CraftLocation.toBukkit(this.position(), bworld, this.getYRot(), this.getXRot());
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+
+ this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
+ this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
+
+ if (!from.equals(to)) {
+ this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to));
+ }
+ // CraftBukkit end
if (this.getMinecartType() == EntityMinecartAbstract.EnumMinecartType.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) {
List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), IEntitySelector.pushableBy(this));
@@ -342,8 +381,26 @@
Entity entity = (Entity) iterator.next();
if (!(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && !(entity instanceof EntityMinecartAbstract) && !this.isVehicle() && !entity.isPassenger()) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity.startRiding(this);
} else {
+ // CraftBukkit start
+ if (!this.isPassengerOfSameVehicle(entity)) {
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
entity.push((Entity) this);
}
}
@@ -355,6 +412,14 @@
Entity entity1 = (Entity) iterator1.next();
if (!this.hasPassenger(entity1) && entity1.isPushable() && entity1 instanceof EntityMinecartAbstract) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity1.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity1.push((Entity) this);
}
}
@@ -371,7 +436,7 @@
}
protected double getMaxSpeed() {
- return (this.isInWater() ? 4.0D : 8.0D) / 20.0D;
+ return (this.isInWater() ? this.maxSpeed / 2.0D: this.maxSpeed); // CraftBukkit
}
public void activateMinecart(int i, int j, int k, boolean flag) {}
@@ -382,16 +447,30 @@
+ if (!from.equals(to)) {
+ this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to));
+ }
+ // CraftBukkit end
this.updateInWaterStateAndDoFluidPushing();
if (this.isInLava()) {
this.lavaHurt();
@@ -385,12 +424,16 @@
this.setDeltaMovement(MathHelper.clamp(vec3d.x, -d0, d0), vec3d.y, MathHelper.clamp(vec3d.z, -d0, d0));
if (this.onGround()) {
@@ -155,30 +98,7 @@
}
}
+ // CraftBukkit start
+ @Override
+ public Vec3D getKnownMovement() {
+ double d0 = this.getMaxSpeed();
+ Vec3D vec3d = super.getKnownMovement();
+
+ return new Vec3D(MathHelper.clamp(vec3d.x, -d0, d0), vec3d.y, MathHelper.clamp(vec3d.z, -d0, d0));
+ }
+ // CraftBukkit end
+
protected void moveAlongTrack(BlockPosition blockposition, IBlockData iblockdata) {
this.resetFallDistance();
double d0 = this.getX();
@@ -583,7 +662,7 @@
}
protected void applyNaturalSlowdown() {
- double d0 = this.isVehicle() ? 0.997D : 0.96D;
+ double d0 = this.isVehicle() || !this.slowWhenEmpty ? 0.997D : 0.96D; // CraftBukkit - add !this.slowWhenEmpty
Vec3D vec3d = this.getDeltaMovement();
vec3d = vec3d.multiply(d0, 0.0D, d0);
@@ -722,6 +801,14 @@
@@ -521,6 +564,14 @@
if (!this.level().isClientSide) {
if (!entity.noPhysics && !this.noPhysics) {
if (!this.hasPassenger(entity)) {
@@ -193,9 +113,9 @@
double d0 = entity.getX() - this.getX();
double d1 = entity.getZ() - this.getZ();
double d2 = d0 * d0 + d1 * d1;
@@ -896,4 +983,26 @@
private EnumMinecartType() {}
@@ -645,4 +696,26 @@
public boolean isFurnace() {
return false;
}
+
+ // CraftBukkit start - Methods for getting and setting flying and derailed velocity modifiers

2
paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartCommandBlock.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/EntityMinecartCommandBlock.java
+++ b/net/minecraft/world/entity/vehicle/EntityMinecartCommandBlock.java
@@ -143,5 +143,12 @@
@@ -140,5 +140,12 @@
public boolean isValid() {
return !EntityMinecartCommandBlock.this.isRemoved();
}

14
paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartContainer.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/entity/vehicle/EntityMinecartContainer.java
+++ b/net/minecraft/world/entity/vehicle/EntityMinecartContainer.java
@@ -19,6 +19,15 @@
import net.minecraft.world.level.World;
@@ -21,6 +21,15 @@
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import java.util.List;
@@ -16,7 +16,7 @@
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ContainerEntity {
private NonNullList<ItemStack> itemStacks;
@@ -26,14 +35,55 @@
@@ -28,9 +37,50 @@
public ResourceKey<LootTable> lootTable;
public long lootTableSeed;
@@ -67,14 +67,8 @@
+ this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
}
protected EntityMinecartContainer(EntityTypes<?> entitytypes, double d0, double d1, double d2, World world) {
super(entitytypes, world, d0, d1, d2);
- this.itemStacks = NonNullList.withSize(36, ItemStack.EMPTY);
+ this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
}
@Override
@@ -77,11 +127,18 @@
@@ -74,11 +124,18 @@
@Override
public void remove(Entity.RemovalReason entity_removalreason) {

24
paper-server/nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartTNT.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/EntityMinecartTNT.java
+++ b/net/minecraft/world/entity/vehicle/EntityMinecartTNT.java
@@ -23,6 +23,11 @@
@@ -26,6 +26,11 @@
import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.level.material.Fluid;
@@ -12,20 +12,28 @@
public class EntityMinecartTNT extends EntityMinecartAbstract {
private static final byte EVENT_PRIME = 10;
@@ -113,8 +118,16 @@
d1 = 5.0D;
}
@@ -33,6 +38,7 @@
private static final float DEFAULT_EXPLOSION_POWER_BASE = 4.0F;
public int fuse = -1;
public float explosionPowerBase = 4.0F;
+ public boolean isIncendiary = false; // CraftBukkit - add field
- this.level().explode(this, damagesource, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), (float) (4.0D + this.random.nextDouble() * 1.5D * d1), false, World.a.TNT);
public EntityMinecartTNT(EntityTypes<? extends EntityMinecartTNT> entitytypes, World world) {
super(entitytypes, world);
@@ -113,8 +119,16 @@
if (world instanceof WorldServer worldserver) {
double d1 = Math.min(Math.sqrt(d0), 5.0D);
- worldserver.explode(this, damagesource, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), (float) ((double) this.explosionPowerBase + this.random.nextDouble() * 1.5D * d1), false, World.a.TNT);
- this.discard();
+ // CraftBukkit start
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), (float) (4.0D + this.random.nextDouble() * 1.5D * d1), false);
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), (float) ((double) this.explosionPowerBase + this.random.nextDouble() * 1.5D * d1), this.isIncendiary);
+ worldserver.getCraftServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ fuse = -1;
+ return;
+ }
+ this.level().explode(this, damagesource, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.TNT);
+ worldserver.explode(this, damagesource, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.TNT);
+ // CraftBukkit end
+ this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
}

70
paper-server/nms-patches/net/minecraft/world/entity/vehicle/NewMinecartBehavior.patch Normal file
View File

@@ -0,0 +1,70 @@
--- a/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
+++ b/net/minecraft/world/entity/vehicle/NewMinecartBehavior.java
@@ -28,6 +28,11 @@
import net.minecraft.world.phys.AxisAlignedBB;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+// CraftBukkit end
+
public class NewMinecartBehavior extends MinecartBehavior {
public static final int POS_ROT_LERP_TICKS = 3;
@@ -544,7 +549,7 @@
@Override
public double getSlowdownFactor() {
- return this.minecart.isVehicle() ? 0.997D : 0.975D;
+ return this.minecart.isVehicle() || !this.minecart.slowWhenEmpty ? 0.997D : 0.975D; // CraftBukkit - add !this.slowWhenEmpty
}
@Override
@@ -571,6 +576,14 @@
Entity entity = (Entity) iterator.next();
if (!(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && !(entity instanceof EntityMinecartAbstract) && !this.minecart.isVehicle() && !entity.isPassenger()) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
boolean flag = entity.startRiding(this.minecart);
if (flag) {
@@ -597,6 +610,16 @@
Entity entity = (Entity) iterator.next();
if (entity instanceof EntityHuman || entity instanceof EntityIronGolem || entity instanceof EntityMinecartAbstract || this.minecart.isVehicle() || entity.isPassenger()) {
+ // CraftBukkit start
+ if (!this.minecart.isPassengerOfSameVehicle(entity)) {
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
entity.push((Entity) this.minecart);
flag = true;
}
@@ -609,6 +632,14 @@
Entity entity1 = (Entity) iterator1.next();
if (!this.minecart.hasPassenger(entity1) && entity1.isPushable() && entity1 instanceof EntityMinecartAbstract) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity1.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity1.push((Entity) this.minecart);
flag = true;
}

70
paper-server/nms-patches/net/minecraft/world/entity/vehicle/OldMinecartBehavior.patch Normal file
View File

@@ -0,0 +1,70 @@
--- a/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
+++ b/net/minecraft/world/entity/vehicle/OldMinecartBehavior.java
@@ -25,6 +25,11 @@
import net.minecraft.world.phys.AxisAlignedBB;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+// CraftBukkit end
+
public class OldMinecartBehavior extends MinecartBehavior {
private static final double MINECART_RIDABLE_THRESHOLD = 0.01D;
@@ -454,8 +459,26 @@
Entity entity = (Entity) iterator.next();
if (!(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && !(entity instanceof EntityMinecartAbstract) && !this.minecart.isVehicle() && !entity.isPassenger()) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity.startRiding(this.minecart);
} else {
+ // CraftBukkit start
+ if (!this.minecart.isPassengerOfSameVehicle(entity)) {
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
entity.push((Entity) this.minecart);
}
}
@@ -467,6 +490,14 @@
Entity entity1 = (Entity) iterator1.next();
if (!this.minecart.hasPassenger(entity1) && entity1.isPushable() && entity1 instanceof EntityMinecartAbstract) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.minecart.getBukkitEntity(), entity1.getBukkitEntity());
+ this.level().getCraftServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity1.push((Entity) this.minecart);
}
}
@@ -487,11 +518,11 @@
@Override
public double getMaxSpeed(WorldServer worldserver) {
- return this.minecart.isInWater() ? 0.2D : 0.4D;
+ return (this.minecart.isInWater() ? this.minecart.maxSpeed / 2.0D: this.minecart.maxSpeed); // CraftBukkit
}
@Override
public double getSlowdownFactor() {
- return this.minecart.isVehicle() ? 0.997D : 0.96D;
+ return this.minecart.isVehicle() || !this.minecart.slowWhenEmpty ? 0.997D : 0.96D; // CraftBukkit - add !this.slowWhenEmpty
}
}

68
paper-server/nms-patches/net/minecraft/world/entity/vehicle/VehicleEntity.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/vehicle/VehicleEntity.java
+++ b/net/minecraft/world/entity/vehicle/VehicleEntity.java
@@ -14,6 +14,13 @@
@@ -17,6 +17,13 @@
import net.minecraft.world.level.World;
import net.minecraft.world.level.gameevent.GameEvent;
@@ -14,42 +14,30 @@
public abstract class VehicleEntity extends Entity {
protected static final DataWatcherObject<Integer> DATA_ID_HURT = DataWatcher.defineId(VehicleEntity.class, DataWatcherRegistry.INT);
@@ -30,6 +37,18 @@
if (this.isInvulnerableTo(damagesource)) {
return false;
} else {
+ // CraftBukkit start
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+ org.bukkit.entity.Entity attacker = (damagesource.getEntity() == null) ? null : damagesource.getEntity().getBukkitEntity();
@@ -40,6 +47,18 @@
return false;
} else {
boolean flag;
+ // CraftBukkit start
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+ org.bukkit.entity.Entity attacker = (damagesource.getEntity() == null) ? null : damagesource.getEntity().getBukkitEntity();
+
+ VehicleDamageEvent event = new VehicleDamageEvent(vehicle, attacker, (double) f);
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+ VehicleDamageEvent event = new VehicleDamageEvent(vehicle, attacker, (double) f);
+ this.level().getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return false;
+ }
+ f = (float) event.getDamage();
+ // CraftBukkit end
+ if (event.isCancelled()) {
+ return false;
+ }
+ f = (float) event.getDamage();
+ // CraftBukkit end
label32:
{
this.setHurtDir(-this.getHurtDir());
this.setHurtTime(10);
this.markHurt();
@@ -39,9 +58,27 @@
@@ -65,9 +84,27 @@
if ((flag || this.getDamage() <= 40.0F) && !this.shouldSourceDestroy(damagesource)) {
if (flag) {
- this.discard();
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, attacker);
+ this.level().getCraftServer().getPluginManager().callEvent(destroyEvent);
+
+ if (destroyEvent.isCancelled()) {
+ this.setDamage(40.0F); // Maximize damage so this doesn't get triggered again right away
+ return true;
+ }
+ // CraftBukkit end
+ this.discard(EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
}
} else {
if ((flag1 || this.getDamage() <= 40.0F) && !this.shouldSourceDestroy(damagesource)) {
if (flag1) {
- this.discard();
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, attacker);
+ this.level().getCraftServer().getPluginManager().callEvent(destroyEvent);
@@ -59,6 +47,18 @@
+ return true;
+ }
+ // CraftBukkit end
this.destroy(damagesource);
+ this.discard(EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
}
} else {
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, attacker);
+ this.level().getCraftServer().getPluginManager().callEvent(destroyEvent);
+
+ if (destroyEvent.isCancelled()) {
+ this.setDamage(40.0F); // Maximize damage so this doesn't get triggered again right away
+ return true;
+ }
+ // CraftBukkit end
this.destroy(worldserver, damagesource);
}