Paper/nms-patches/EntityBoat.patch

147 lines
6.0 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityBoat.java
+++ b/net/minecraft/server/EntityBoat.java
2018-07-15 02:00:00 +02:00
@@ -3,6 +3,15 @@
import java.util.List;
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.event.vehicle.VehicleMoveEvent;
+// CraftBukkit end
+
public class EntityBoat extends Entity {
2019-04-23 04:00:00 +02:00
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
2018-07-15 02:00:00 +02:00
@@ -37,6 +46,14 @@
2019-04-23 04:00:00 +02:00
private float aO;
private float aP;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
2016-02-29 22:32:46 +01:00
+ // PAIL: Some of these haven't worked since a few updates, and since 1.9 they are less and less applicable.
+ public double maxSpeed = 0.4D;
+ public double occupiedDeceleration = 0.2D;
+ public double unoccupiedDeceleration = -1;
+ public boolean landBoats = false;
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2019-04-23 04:00:00 +02:00
public EntityBoat(EntityTypes<? extends EntityBoat> entitytypes, World world) {
super(entitytypes, world);
this.as = new float[2];
@@ -98,6 +115,19 @@
2016-02-29 22:32:46 +01:00
if (damagesource instanceof EntityDamageSourceIndirect && damagesource.getEntity() != null && this.w(damagesource.getEntity())) {
return false;
} else {
+ // 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.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return false;
+ }
+ // f = event.getDamage(); // TODO Why don't we do this?
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2018-07-15 02:00:00 +02:00
this.c(-this.o());
this.b(10);
2019-04-23 04:00:00 +02:00
this.setDamage(this.getDamage() + f * 10.0F);
@@ -105,6 +135,15 @@
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
2019-04-23 04:00:00 +02:00
if (flag || this.getDamage() > 40.0F) {
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, attacker);
+ this.world.getServer().getPluginManager().callEvent(destroyEvent);
+
+ if (destroyEvent.isCancelled()) {
+ this.setDamage(40F); // Maximize damage so this doesn't get triggered again right away
+ return true;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
if (!flag && this.world.getGameRules().getBoolean("doEntityDrops")) {
2018-07-15 02:00:00 +02:00
this.a((IMaterial) this.f());
}
2019-04-23 04:00:00 +02:00
@@ -140,9 +179,25 @@
2016-02-29 22:32:46 +01:00
public void collide(Entity entity) {
if (entity instanceof EntityBoat) {
2018-10-22 21:00:00 +02:00
if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
+ VehicleEntityCollisionEvent event = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
2016-02-29 22:32:46 +01:00
+ // CraftBukkit end
super.collide(entity);
}
2018-10-22 21:00:00 +02:00
} else if (entity.getBoundingBox().minY <= this.getBoundingBox().minY) {
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
+ VehicleEntityCollisionEvent event = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
super.collide(entity);
}
2019-04-23 04:00:00 +02:00
@@ -176,6 +231,7 @@
return this.getDirection().e();
}
+ private Location lastLocation; // CraftBukkit
2019-04-23 04:00:00 +02:00
@Override
2018-07-15 02:00:00 +02:00
public void tick() {
2019-04-23 04:00:00 +02:00
this.aJ = this.aI;
@@ -219,6 +275,22 @@
this.setMot(Vec3D.a);
}
+ // CraftBukkit start
+ 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);
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+
+ server.getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
+
+ if (lastLocation != null && !lastLocation.equals(to)) {
+ VehicleMoveEvent event = new VehicleMoveEvent(vehicle, lastLocation, to);
+ server.getPluginManager().callEvent(event);
+ }
+ lastLocation = vehicle.getLocation();
+ // CraftBukkit end
+
2018-07-15 02:00:00 +02:00
this.q();
for (int i = 0; i <= 1; ++i) {
2019-04-23 04:00:00 +02:00
@@ -740,6 +812,11 @@
2019-04-23 04:00:00 +02:00
this.b(this.fallDistance, 1.0F);
2016-02-29 22:32:46 +01:00
if (!this.world.isClientSide && !this.dead) {
+ // CraftBukkit start
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, null);
+ this.world.getServer().getPluginManager().callEvent(destroyEvent);
+ if (!destroyEvent.isCancelled()) {
2016-02-29 22:32:46 +01:00
this.die();
if (this.world.getGameRules().getBoolean("doEntityDrops")) {
int i;
2019-04-23 04:00:00 +02:00
@@ -753,6 +830,7 @@
2016-02-29 22:32:46 +01:00
}
2015-02-26 23:41:06 +01:00
}
}
2015-02-26 23:41:06 +01:00
+ } // CraftBukkit end
}
this.fallDistance = 0.0F;