From 89b449e9e64b8bd5f1acdef8899dc2fb272aeb6a Mon Sep 17 00:00:00 2001
From: Bjarne Koll <32834385+lynxplay@users.noreply.github.com>
Date: Wed, 20 Oct 2021 05:14:30 +0200
Subject: [PATCH] Correctly inflate villager activation bounding box (#6798)

---
 patches/server/Entity-Activation-Range-2.0.patch              | 2 +-
 patches/server/Rewrite-entity-bounding-box-lookup-calls.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/server/Entity-Activation-Range-2.0.patch
index 5b99a05e6..bc9963113 100644
--- a/patches/server/Entity-Activation-Range-2.0.patch
+++ b/patches/server/Entity-Activation-Range-2.0.patch
@@ -521,7 +521,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper start
 +            ActivationType.WATER.boundingBox = player.getBoundingBox().inflate( waterActivationRange, 256, waterActivationRange );
 +            ActivationType.FLYING_MONSTER.boundingBox = player.getBoundingBox().inflate( flyingActivationRange, 256, flyingActivationRange );
-+            ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, waterActivationRange );
++            ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, villagerActivationRange );
 +            // Paper end
  
              world.getEntities().get(maxBB, ActivationRange::activateEntity);
diff --git a/patches/server/Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/Rewrite-entity-bounding-box-lookup-calls.patch
index 04a47d72a..91ca12be9 100644
--- a/patches/server/Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/Rewrite-entity-bounding-box-lookup-calls.patch
@@ -1313,7 +1313,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +0,0 @@ public class ActivationRange
-             ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, waterActivationRange );
+             ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, villagerActivationRange );
              // Paper end
  
 -            world.getEntities().get(maxBB, ActivationRange::activateEntity);