2021-06-14 08:37:14 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 10 May 2020 22:12:46 -0400
Subject: [PATCH] Ensure Entity AABB's are never invalid
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
2022-10-07 18:43:26 +00:00
index 326928fec8c0a1b8892091e02be7ddf73b92ff26..8f7cdc52f5c1888a69e714f948fdc46412b2ab50 100644
2021-06-14 08:37:14 +00:00
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
2022-09-26 08:02:51 +00:00
@@ -713,8 +713,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2021-07-09 01:18:32 +00:00
}
2021-06-14 08:37:14 +00:00
public void setPos(double x, double y, double z) {
2021-07-09 01:18:32 +00:00
- this.setPosRaw(x, y, z);
2021-06-14 08:37:14 +00:00
- this.setBoundingBox(this.makeBoundingBox());
2021-07-09 01:18:32 +00:00
+ this.setPosRaw(x, y, z, true); // Paper - force bounding box update
2021-06-14 08:37:14 +00:00
+ // this.setBoundingBox(this.makeBoundingBox()); // Paper - move into setPositionRaw
}
protected AABB makeBoundingBox() {
2022-10-07 18:43:26 +00:00
@@ -3946,6 +3946,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2021-06-14 08:37:14 +00:00
}
public final void setPosRaw(double x, double y, double z) {
2021-07-09 01:18:32 +00:00
+ // Paper start
+ this.setPosRaw(x, y, z, false);
+ }
+ public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
2021-06-14 08:37:14 +00:00
+ // Paper end
2022-09-26 08:02:51 +00:00
// Paper start - rewrite chunk system
if (this.updatingSectionStatus) {
LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
2022-10-07 18:43:26 +00:00
@@ -3969,6 +3974,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2022-06-08 05:02:19 +00:00
this.levelCallback.onMove();
2021-07-09 01:18:32 +00:00
}
+ // Paper start - never allow AABB to become desynced from position
+ // hanging has its own special logic
+ if (!(this instanceof net.minecraft.world.entity.decoration.HangingEntity) && (forceBoundingBoxUpdate || this.position.x != x || this.position.y != y || this.position.z != z)) {
+ this.setBoundingBox(this.makeBoundingBox());
+ }
+ // Paper end
}
public void checkDespawn() {}