3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-29 01:20:10 +01:00
Paper/nms-patches/EntityMinecartAbstract.patch

246 Zeilen
11 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityMinecartAbstract.java
+++ b/net/minecraft/server/EntityMinecartAbstract.java
2020-06-25 02:00:00 +02:00
@@ -10,6 +10,15 @@
2019-12-10 23:00:00 +01:00
import java.util.Map;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.vehicle.VehicleDamageEvent;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+import org.bukkit.util.Vector;
+// CraftBukkit end
+
2019-04-23 04:00:00 +02:00
public abstract class EntityMinecartAbstract extends Entity {
2019-04-23 04:00:00 +02:00
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.b);
2020-06-25 02:00:00 +02:00
@@ -20,7 +29,7 @@
2019-12-10 23:00:00 +01:00
private static final DataWatcherObject<Boolean> g = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.i);
2020-06-25 02:00:00 +02:00
private static final ImmutableMap<EntityPose, ImmutableList<Integer>> an = ImmutableMap.of(EntityPose.STANDING, ImmutableList.of(0, 1, -1), EntityPose.CROUCHING, ImmutableList.of(0, 1, -1), EntityPose.SWIMMING, ImmutableList.of(0, 1));
2019-12-10 23:00:00 +01:00
private boolean ao;
- private static final Map<BlockPropertyTrackPosition, Pair<BaseBlockPosition, BaseBlockPosition>> ap = (Map) SystemUtils.a((Object) Maps.newEnumMap(BlockPropertyTrackPosition.class), (enummap) -> {
+ private static final Map<BlockPropertyTrackPosition, Pair<BaseBlockPosition, BaseBlockPosition>> ap = (Map) SystemUtils.a(Maps.newEnumMap(BlockPropertyTrackPosition.class), (enummap) -> { // CraftBukkit - decompile error
BaseBlockPosition baseblockposition = EnumDirection.WEST.p();
BaseBlockPosition baseblockposition1 = EnumDirection.EAST.p();
BaseBlockPosition baseblockposition2 = EnumDirection.NORTH.p();
2020-06-25 02:00:00 +02:00
@@ -48,6 +57,17 @@
2019-12-10 23:00:00 +01:00
private double au;
private double av;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ public boolean slowWhenEmpty = true;
+ private double derailedX = 0.5;
+ private double derailedY = 0.5;
+ private double derailedZ = 0.5;
+ private double flyingX = 0.95;
+ private double flyingY = 0.95;
+ private double flyingZ = 0.95;
+ public double maxSpeed = 0.4D;
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2018-07-15 02:00:00 +02:00
protected EntityMinecartAbstract(EntityTypes<?> entitytypes, World world) {
super(entitytypes, world);
2019-04-23 04:00:00 +02:00
this.i = true;
2020-06-25 02:00:00 +02:00
@@ -168,6 +188,19 @@
if (this.isInvulnerable(damagesource)) {
return false;
} else {
+ // CraftBukkit start - fire VehicleDamageEvent
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+ org.bukkit.entity.Entity passenger = (damagesource.getEntity() == null) ? null : damagesource.getEntity().getBukkitEntity();
+
+ VehicleDamageEvent event = new VehicleDamageEvent(vehicle, passenger, f);
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return false;
+ }
+
+ f = (float) event.getDamage();
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
this.d(-this.n());
this.c(10);
this.velocityChanged();
2020-06-25 02:00:00 +02:00
@@ -175,6 +208,15 @@
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
if (flag || this.getDamage() > 40.0F) {
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, passenger);
+ this.world.getServer().getPluginManager().callEvent(destroyEvent);
+
+ if (destroyEvent.isCancelled()) {
+ this.setDamage(40); // Maximize damage so this doesn't get triggered again right away
+ return true;
+ }
+ // CraftBukkit end
2017-05-30 13:25:59 +02:00
this.ejectPassengers();
2016-02-29 22:32:46 +01:00
if (flag && !this.hasCustomName()) {
this.die();
2020-06-25 02:00:00 +02:00
@@ -227,6 +269,14 @@
2019-04-23 04:00:00 +02:00
@Override
2018-07-15 02:00:00 +02:00
public void tick() {
+ // CraftBukkit start
2019-12-10 23:00:00 +01:00
+ double prevX = this.locX();
+ double prevY = this.locY();
+ double prevZ = this.locZ();
+ float prevYaw = this.yaw;
+ float prevPitch = this.pitch;
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
+
if (this.getType() > 0) {
2019-04-23 04:00:00 +02:00
this.c(this.getType() - 1);
}
2020-06-25 02:00:00 +02:00
@@ -239,7 +289,7 @@
this.ai();
}
2019-04-23 04:00:00 +02:00
- this.doPortalTick();
+ // this.doPortalTick(); // CraftBukkit - handled in postTick
if (this.world.isClientSide) {
2019-12-10 23:00:00 +01:00
if (this.aq > 0) {
double d0 = this.locX() + (this.ar - this.locX()) / (double) this.aq;
2020-06-25 02:00:00 +02:00
@@ -302,6 +352,18 @@
}
this.setYawPitch(this.yaw, this.pitch);
+ // CraftBukkit start
+ org.bukkit.World bworld = this.world.getWorld();
+ Location from = new Location(bworld, prevX, prevY, prevZ, prevYaw, prevPitch);
2019-12-10 23:00:00 +01:00
+ Location to = new Location(bworld, this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+
+ this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
+
+ if (!from.equals(to)) {
+ this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to));
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
if (this.getMinecartType() == EntityMinecartAbstract.EnumMinecartType.RIDEABLE && b(this.getMot()) > 0.01D) {
2018-12-25 22:00:00 +01:00
List<Entity> list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D), IEntitySelector.a(this));
2016-06-09 03:43:49 +02:00
2020-06-25 02:00:00 +02:00
@@ -310,8 +372,26 @@
2016-06-09 03:43:49 +02:00
Entity entity = (Entity) list.get(l);
if (!(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && !(entity instanceof EntityMinecartAbstract) && !this.isVehicle() && !entity.isPassenger()) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity.startRiding(this);
} else {
+ // CraftBukkit start
+ if (!this.isSameVehicle(entity)) {
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
2016-06-09 03:43:49 +02:00
entity.collide(this);
}
}
2020-06-25 02:00:00 +02:00
@@ -323,6 +403,14 @@
Entity entity1 = (Entity) iterator.next();
if (!this.w(entity1) && entity1.isCollidable() && entity1 instanceof EntityMinecartAbstract) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity1.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
entity1.collide(this);
}
}
2020-06-25 02:00:00 +02:00
@@ -333,7 +421,7 @@
}
2019-04-23 04:00:00 +02:00
protected double getMaxSpeed() {
- return 0.4D;
+ return this.maxSpeed; // CraftBukkit
}
public void a(int i, int j, int k, boolean flag) {}
2020-06-25 02:00:00 +02:00
@@ -344,12 +432,16 @@
2019-04-23 04:00:00 +02:00
this.setMot(MathHelper.a(vec3d.x, -d0, d0), vec3d.y, MathHelper.a(vec3d.z, -d0, d0));
if (this.onGround) {
2019-04-23 04:00:00 +02:00
- this.setMot(this.getMot().a(0.5D));
+ // CraftBukkit start - replace magic numbers with our variables
2019-04-23 04:00:00 +02:00
+ this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
+ // CraftBukkit end
}
2019-04-23 04:00:00 +02:00
this.move(EnumMoveType.SELF, this.getMot());
if (!this.onGround) {
2019-04-23 04:00:00 +02:00
- this.setMot(this.getMot().a(0.95D));
+ // CraftBukkit start - replace magic numbers with our variables
2019-04-23 04:00:00 +02:00
+ this.setMot(new Vec3D(this.getMot().x * this.flyingX, this.getMot().y * this.flyingY, this.getMot().z * this.flyingZ));
+ // CraftBukkit end
}
}
2020-06-25 02:00:00 +02:00
@@ -536,7 +628,7 @@
}
2019-04-23 04:00:00 +02:00
protected void decelerate() {
- double d0 = this.isVehicle() ? 0.997D : 0.96D;
+ double d0 = this.isVehicle() || !this.slowWhenEmpty ? 0.997D : 0.96D; // CraftBukkit - add !this.slowWhenEmpty
this.setMot(this.getMot().d(d0, 0.0D, d0));
}
2020-06-25 02:00:00 +02:00
@@ -619,6 +711,14 @@
if (!this.world.isClientSide) {
if (!entity.noclip && !this.noclip) {
if (!this.w(entity)) {
+ // CraftBukkit start
+ VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(collisionEvent);
+
+ if (collisionEvent.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
double d0 = entity.locX() - this.locX();
double d1 = entity.locZ() - this.locZ();
double d2 = d0 * d0 + d1 * d1;
2020-06-25 02:00:00 +02:00
@@ -754,4 +854,26 @@
2019-04-23 04:00:00 +02:00
private EnumMinecartType() {}
}
+
+ // CraftBukkit start - Methods for getting and setting flying and derailed velocity modifiers
+ public Vector getFlyingVelocityMod() {
+ return new Vector(flyingX, flyingY, flyingZ);
+ }
+
+ public void setFlyingVelocityMod(Vector flying) {
+ flyingX = flying.getX();
+ flyingY = flying.getY();
+ flyingZ = flying.getZ();
+ }
+
+ public Vector getDerailedVelocityMod() {
+ return new Vector(derailedX, derailedY, derailedZ);
+ }
+
+ public void setDerailedVelocityMod(Vector derailed) {
+ derailedX = derailed.getX();
+ derailedY = derailed.getY();
+ derailedZ = derailed.getZ();
+ }
+ // CraftBukkit end
}