From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: nostalgic853 Date: Mon, 24 Oct 2022 11:01:36 +0800 Subject: [PATCH] Skip entity move if no movement Copyright (c) 2021-2022 ishland Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 7ef574008f413008427d075860c9eb5debeef4f4..83eece9c61f8316221a304f3dd69a7fe3cce3727 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { private UUID originWorld; public boolean freezeLocked = false; // Paper - Freeze Tick Lock API public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API + private boolean boundingBoxChanged = false; // KeYi public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); @@ -1035,6 +1036,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper end - detailed watchdog information public void move(MoverType movementType, Vec3 movement) { + // KeYi start + if (!boundingBoxChanged && movement.equals(Vec3.ZERO)) { + boundingBoxChanged = false; + return; + } + // KeYi end + // Paper start - detailed watchdog information io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); synchronized (this.posLock) { @@ -3796,6 +3804,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setBoundingBox(AABB boundingBox) { + if (!this.bb.equals(boundingBox)) boundingBoxChanged = true; // KeYi // CraftBukkit start - block invalid bounding boxes double minX = boundingBox.minX, minY = boundingBox.minY,