246 Zeilen
11 KiB
Diff
246 Zeilen
11 KiB
Diff
--- a/net/minecraft/server/EntityMinecartAbstract.java
|
|
+++ b/net/minecraft/server/EntityMinecartAbstract.java
|
|
@@ -8,6 +8,15 @@
|
|
import java.util.Map;
|
|
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
|
|
+
|
|
public abstract class EntityMinecartAbstract extends Entity {
|
|
|
|
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.b);
|
|
@@ -17,7 +26,7 @@
|
|
private static final DataWatcherObject<Integer> f = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.b);
|
|
private static final DataWatcherObject<Boolean> g = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.i);
|
|
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();
|
|
@@ -45,6 +54,17 @@
|
|
private double au;
|
|
private double av;
|
|
|
|
+ // 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
|
|
+
|
|
protected EntityMinecartAbstract(EntityTypes<?> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
this.i = true;
|
|
@@ -100,6 +120,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
|
|
this.d(-this.n());
|
|
this.c(10);
|
|
this.velocityChanged();
|
|
@@ -107,6 +140,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
|
|
this.ejectPassengers();
|
|
if (flag && !this.hasCustomName()) {
|
|
this.die();
|
|
@@ -152,6 +194,14 @@
|
|
|
|
@Override
|
|
public void tick() {
|
|
+ // CraftBukkit start
|
|
+ double prevX = this.locX();
|
|
+ double prevY = this.locY();
|
|
+ double prevZ = this.locZ();
|
|
+ float prevYaw = this.yaw;
|
|
+ float prevPitch = this.pitch;
|
|
+ // CraftBukkit end
|
|
+
|
|
if (this.getType() > 0) {
|
|
this.c(this.getType() - 1);
|
|
}
|
|
@@ -164,7 +214,7 @@
|
|
this.af();
|
|
}
|
|
|
|
- this.doPortalTick();
|
|
+ // this.doPortalTick(); // CraftBukkit - handled in postTick
|
|
if (this.world.isClientSide) {
|
|
if (this.aq > 0) {
|
|
double d0 = this.locX() + (this.ar - this.locX()) / (double) this.aq;
|
|
@@ -227,6 +277,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);
|
|
+ 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
|
|
if (this.getMinecartType() == EntityMinecartAbstract.EnumMinecartType.RIDEABLE && b(this.getMot()) > 0.01D) {
|
|
List<Entity> list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D), IEntitySelector.a(this));
|
|
|
|
@@ -235,8 +297,26 @@
|
|
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
|
|
entity.collide(this);
|
|
}
|
|
}
|
|
@@ -248,6 +328,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);
|
|
}
|
|
}
|
|
@@ -258,7 +346,7 @@
|
|
}
|
|
|
|
protected double getMaxSpeed() {
|
|
- return 0.4D;
|
|
+ return this.maxSpeed; // CraftBukkit
|
|
}
|
|
|
|
public void a(int i, int j, int k, boolean flag) {}
|
|
@@ -269,12 +357,16 @@
|
|
|
|
this.setMot(MathHelper.a(vec3d.x, -d0, d0), vec3d.y, MathHelper.a(vec3d.z, -d0, d0));
|
|
if (this.onGround) {
|
|
- this.setMot(this.getMot().a(0.5D));
|
|
+ // CraftBukkit start - replace magic numbers with our variables
|
|
+ this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
this.move(EnumMoveType.SELF, this.getMot());
|
|
if (!this.onGround) {
|
|
- this.setMot(this.getMot().a(0.95D));
|
|
+ // CraftBukkit start - replace magic numbers with our variables
|
|
+ this.setMot(new Vec3D(this.getMot().x * this.flyingX, this.getMot().y * this.flyingY, this.getMot().z * this.flyingZ));
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|
|
@@ -461,7 +553,7 @@
|
|
}
|
|
|
|
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));
|
|
}
|
|
@@ -544,6 +636,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
|
|
double d0 = entity.locX() - this.locX();
|
|
double d1 = entity.locZ() - this.locZ();
|
|
double d2 = d0 * d0 + d1 * d1;
|
|
@@ -679,4 +779,26 @@
|
|
|
|
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
|
|
}
|