Paper/nms-patches/EntityBoat.patch

164 lines
6.5 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
2016-05-10 13:47:39 +02:00
@@ -5,6 +5,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 {
2016-02-29 22:32:46 +01:00
private static final DataWatcherObject<Integer> a = DataWatcher.a(EntityBoat.class, DataWatcherRegistry.b);
2016-05-10 13:47:39 +02:00
@@ -32,6 +41,14 @@
2016-06-09 03:43:49 +02:00
private EntityBoat.EnumStatus aI;
private double aJ;
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
+
public EntityBoat(World world) {
super(world);
2016-02-29 22:32:46 +01:00
this.f = new float[2];
2016-05-10 13:47:39 +02:00
@@ -48,6 +65,7 @@
this.lastX = d0;
this.lastY = d1;
this.lastZ = d2;
+ this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleCreateEvent((Vehicle) this.getBukkitEntity())); // CraftBukkit
}
2016-02-29 22:32:46 +01:00
protected boolean playStepSound() {
2016-06-09 03:43:49 +02:00
@@ -95,6 +113,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 true;
+ }
+ // f = event.getDamage(); // TODO Why don't we do this?
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
this.d(-this.q());
this.b(10);
this.setDamage(this.n() + f * 10.0F);
2016-06-09 03:43:49 +02:00
@@ -102,6 +133,15 @@
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
2016-02-29 22:32:46 +01:00
if (flag || this.n() > 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")) {
this.a(this.j(), 1, 0.0F);
}
2016-06-09 03:43:49 +02:00
@@ -119,9 +159,25 @@
2016-02-29 22:32:46 +01:00
public void collide(Entity entity) {
if (entity instanceof EntityBoat) {
if (entity.getBoundingBox().b < this.getBoundingBox().e) {
+ // 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);
}
} else if (entity.getBoundingBox().b <= this.getBoundingBox().b) {
+ // 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);
}
2016-06-09 03:43:49 +02:00
@@ -158,6 +214,8 @@
return this.getDirection().e();
}
+ private Location lastLocation; // CraftBukkit
+
public void m() {
2016-06-09 03:43:49 +02:00
this.aI = this.aH;
this.aH = this.t();
@@ -178,7 +236,6 @@
if (this.n() > 0.0F) {
2016-02-29 22:32:46 +01:00
this.setDamage(this.n() - 1.0F);
}
-
2016-02-29 22:32:46 +01:00
this.lastX = this.locX;
this.lastY = this.locY;
this.lastZ = this.locZ;
2016-06-09 03:43:49 +02:00
@@ -202,6 +259,22 @@
this.motZ = 0.0D;
}
+ // 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
+
for (int i = 0; i <= 1; ++i) {
if (this.a(i)) {
this.f[i] = (float) ((double) this.f[i] + 0.01D);
2016-06-09 03:43:49 +02:00
@@ -599,6 +672,11 @@
2016-02-29 22:32:46 +01:00
this.e(this.fallDistance, 1.0F);
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;
2016-06-09 03:43:49 +02:00
@@ -612,6 +690,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;