mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
176 lines
7.1 KiB
Diff
176 lines
7.1 KiB
Diff
--- a/net/minecraft/server/EntityHanging.java
|
|
+++ b/net/minecraft/server/EntityHanging.java
|
|
@@ -4,6 +4,12 @@
|
|
import javax.annotation.Nullable;
|
|
import org.apache.commons.lang3.Validate;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.entity.Hanging;
|
|
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
|
|
+import org.bukkit.event.hanging.HangingBreakEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityHanging extends Entity {
|
|
|
|
protected static final Predicate<Entity> a = (entity) -> {
|
|
@@ -35,43 +41,52 @@
|
|
this.updateBoundingBox();
|
|
}
|
|
|
|
- protected void updateBoundingBox() {
|
|
- if (this.direction != null) {
|
|
- double d0 = (double) this.blockPosition.getX() + 0.5D;
|
|
- double d1 = (double) this.blockPosition.getY() + 0.5D;
|
|
- double d2 = (double) this.blockPosition.getZ() + 0.5D;
|
|
- double d3 = 0.46875D;
|
|
- double d4 = this.a(this.getWidth());
|
|
- double d5 = this.a(this.getHeight());
|
|
-
|
|
- d0 -= (double) this.direction.getAdjacentX() * 0.46875D;
|
|
- d2 -= (double) this.direction.getAdjacentZ() * 0.46875D;
|
|
- d1 += d5;
|
|
- EnumDirection enumdirection = this.direction.f();
|
|
+ // CraftBukkit start - break out BB calc into own method
|
|
+ public static AxisAlignedBB calculateBoundingBox(Entity entity, BlockPosition blockPosition, EnumDirection direction, int width, int height) {
|
|
+ double d0 = (double) blockPosition.getX() + 0.5D;
|
|
+ double d1 = (double) blockPosition.getY() + 0.5D;
|
|
+ double d2 = (double) blockPosition.getZ() + 0.5D;
|
|
+ double d3 = 0.46875D;
|
|
+ double d4 = a(width);
|
|
+ double d5 = a(height);
|
|
+
|
|
+ d0 -= (double) direction.getAdjacentX() * 0.46875D;
|
|
+ d2 -= (double) direction.getAdjacentZ() * 0.46875D;
|
|
+ d1 += d5;
|
|
+ EnumDirection enumdirection = direction.f();
|
|
+
|
|
+ d0 += d4 * (double) enumdirection.getAdjacentX();
|
|
+ d2 += d4 * (double) enumdirection.getAdjacentZ();
|
|
+ if (entity != null) {
|
|
+ entity.locX = d0;
|
|
+ entity.locY = d1;
|
|
+ entity.locZ = d2;
|
|
+ }
|
|
+ double d6 = (double) width;
|
|
+ double d7 = (double) height;
|
|
+ double d8 = (double) width;
|
|
|
|
- d0 += d4 * (double) enumdirection.getAdjacentX();
|
|
- d2 += d4 * (double) enumdirection.getAdjacentZ();
|
|
- this.locX = d0;
|
|
- this.locY = d1;
|
|
- this.locZ = d2;
|
|
- double d6 = (double) this.getWidth();
|
|
- double d7 = (double) this.getHeight();
|
|
- double d8 = (double) this.getWidth();
|
|
-
|
|
- if (this.direction.k() == EnumDirection.EnumAxis.Z) {
|
|
- d8 = 1.0D;
|
|
- } else {
|
|
- d6 = 1.0D;
|
|
- }
|
|
+ if (direction.k() == EnumDirection.EnumAxis.Z) {
|
|
+ d8 = 1.0D;
|
|
+ } else {
|
|
+ d6 = 1.0D;
|
|
+ }
|
|
|
|
- d6 /= 32.0D;
|
|
- d7 /= 32.0D;
|
|
- d8 /= 32.0D;
|
|
- this.a(new AxisAlignedBB(d0 - d6, d1 - d7, d2 - d8, d0 + d6, d1 + d7, d2 + d8));
|
|
+ d6 /= 32.0D;
|
|
+ d7 /= 32.0D;
|
|
+ d8 /= 32.0D;
|
|
+ return new AxisAlignedBB(d0 - d6, d1 - d7, d2 - d8, d0 + d6, d1 + d7, d2 + d8);
|
|
+ }
|
|
+
|
|
+ protected void updateBoundingBox() {
|
|
+ if (this.direction != null) {
|
|
+ // CraftBukkit start code moved in to calculateBoundingBox
|
|
+ this.a(calculateBoundingBox(this, this.blockPosition, this.direction, this.getWidth(), this.getHeight()));
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
- private double a(int i) {
|
|
+ private static double a(int i) { // CraftBukkit - static
|
|
return i % 32 == 0 ? 0.5D : 0.0D;
|
|
}
|
|
|
|
@@ -82,6 +97,24 @@
|
|
if (this.d++ == 100 && !this.world.isClientSide) {
|
|
this.d = 0;
|
|
if (!this.dead && !this.survives()) {
|
|
+ // CraftBukkit start - fire break events
|
|
+ Material material = this.world.getType(new BlockPosition(this)).getMaterial();
|
|
+ HangingBreakEvent.RemoveCause cause;
|
|
+
|
|
+ if (!material.equals(Material.AIR)) {
|
|
+ // TODO: This feels insufficient to catch 100% of suffocation cases
|
|
+ cause = HangingBreakEvent.RemoveCause.OBSTRUCTION;
|
|
+ } else {
|
|
+ cause = HangingBreakEvent.RemoveCause.PHYSICS;
|
|
+ }
|
|
+
|
|
+ HangingBreakEvent event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), cause);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (dead || event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.die();
|
|
this.a((Entity) null);
|
|
}
|
|
@@ -134,6 +167,21 @@
|
|
return false;
|
|
} else {
|
|
if (!this.dead && !this.world.isClientSide) {
|
|
+ // CraftBukkit start - fire break events
|
|
+ HangingBreakEvent event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.DEFAULT);
|
|
+ if (damagesource.getEntity() != null) {
|
|
+ event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity(), damagesource.isExplosion() ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY);
|
|
+ } else if (damagesource.isExplosion()) {
|
|
+ event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.EXPLOSION);
|
|
+ }
|
|
+
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (this.dead || event.isCancelled()) {
|
|
+ return true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.die();
|
|
this.aA();
|
|
this.a(damagesource.getEntity());
|
|
@@ -145,6 +193,18 @@
|
|
|
|
public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
|
|
if (!this.world.isClientSide && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
|
|
+ if (this.dead) return; // CraftBukkit
|
|
+
|
|
+ // CraftBukkit start - fire break events
|
|
+ // TODO - Does this need its own cause? Seems to only be triggered by pistons
|
|
+ HangingBreakEvent event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.PHYSICS);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (this.dead || event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.die();
|
|
this.a((Entity) null);
|
|
}
|
|
@@ -152,7 +212,7 @@
|
|
}
|
|
|
|
public void f(double d0, double d1, double d2) {
|
|
- if (!this.world.isClientSide && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
|
|
+ if (false && !this.world.isClientSide && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) { // CraftBukkit - not needed
|
|
this.die();
|
|
this.a((Entity) null);
|
|
}
|