From b35c03a546de6ce9228e98ab7f8e6f65f3bf63bb Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Thu, 10 Mar 2022 21:39:11 -0500
Subject: [PATCH] Prevent despawned navigators being readded (#7574)

---
 patches/server/Optimise-WorldServer-notify.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/server/Optimise-WorldServer-notify.patch b/patches/server/Optimise-WorldServer-notify.patch
index 0390116cdc..a60150170d 100644
--- a/patches/server/Optimise-WorldServer-notify.patch
+++ b/patches/server/Optimise-WorldServer-notify.patch
@@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void tickNonPassenger(Entity entity) {
          // Paper start - log detailed entity tick information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot tick an entity off-main");
-+        this.entityManager.updateNavigatorsInRegion(entity); // Paper - optimise notify
++        if (!entity.isRemoved()) this.entityManager.updateNavigatorsInRegion(entity); // Paper - optimise notify
          try {
              if (currentlyTickingEntity.get() == null) {
                  currentlyTickingEntity.lazySet(entity);