From bccba9bc3067dff031e23364fee38fc24bbdc1f9 Mon Sep 17 00:00:00 2001
From: Joseph Burton <burtonjae@hotmail.co.uk>
Date: Sun, 7 Apr 2024 00:50:43 +0100
Subject: [PATCH] Ignore minecart in activation range (#10359)

---
 ...> Add-more-entities-to-activation-range-ignore-list.patch} | 4 +++-
 patches/server/Entity-Activation-Range-2.0.patch              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename patches/server/{Always-tick-falling-blocks.patch => Add-more-entities-to-activation-range-ignore-list.patch} (79%)

diff --git a/patches/server/Always-tick-falling-blocks.patch b/patches/server/Add-more-entities-to-activation-range-ignore-list.patch
similarity index 79%
rename from patches/server/Always-tick-falling-blocks.patch
rename to patches/server/Add-more-entities-to-activation-range-ignore-list.patch
index f34fbb3d88..24fde5f623 100644
--- a/patches/server/Always-tick-falling-blocks.patch
+++ b/patches/server/Add-more-entities-to-activation-range-ignore-list.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
-Subject: [PATCH] Always tick falling blocks
+Subject: [PATCH] Add more entities to activation range ignore list
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
@@ -13,6 +13,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  || entity instanceof LightningBolt
                  || entity instanceof PrimedTnt
 +                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity // Paper - Always tick falling blocks
++                || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart // Paper
++                || entity instanceof net.minecraft.world.entity.vehicle.Boat // Paper
                  || entity instanceof EndCrystal
                  || entity instanceof FireworkRocketEntity
                  || entity instanceof ThrownTrident )
diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/server/Entity-Activation-Range-2.0.patch
index d22acba756..4dda42b799 100644
--- a/patches/server/Entity-Activation-Range-2.0.patch
+++ b/patches/server/Entity-Activation-Range-2.0.patch
@@ -137,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.setDeltaMovement(Vec3.ZERO);
              }
 +            // Paper start - ignore movement changes while inactive.
-+            if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
++            if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
 +                setDeltaMovement(Vec3.ZERO);
 +                this.level.getProfiler().pop();
 +                return;