Readd 0414 use distance map to optimise entity tracker (#9868)

1 files changed, 45 insertions, 0 deletions

diff --git a/patches/server/0850-Missing-effect-cause.patch b/patches/server/0850-Missing-effect-cause.patch
new file mode 100644
index 0000000000..cdde105841
--- /dev/null
+++ b/patches/server/0850-Missing-effect-cause.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lulu13022002 <[email protected]>
+Date: Tue, 16 Aug 2022 19:44:55 +0200
+Subject: [PATCH] Missing effect cause
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+index c1b95715a1ae8c89ce98848332b1e9e1c905a6f5..aa850cfaa0534d57e83f37360724da2428a48a18 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+@@ -424,7 +424,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+             player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, j, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // CraftBukkit
+         }
+ 
+-        player.removeEffect(MobEffects.DIG_SLOWDOWN);
++        player.removeEffect(MobEffects.DIG_SLOWDOWN, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // Paper
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
+index c8e783014a6a09d59e85715a7fbf2a5f65201e77..5cba503c7342f66018af568be200999e14aa8d6e 100644
+--- a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
++++ b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
+@@ -28,7 +28,7 @@ public class HoneyBottleItem extends Item {
+         }
+ 
+         if (!world.isClientSide) {
+-            user.removeEffect(MobEffects.POISON);
++            user.removeEffect(MobEffects.POISON, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper
+         }
+ 
+         if (stack.isEmpty()) {
+diff --git a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
+index e6d4dfdbe824cc3dbbad988cdc2ca7c7f6c7a99f..5cf732818a1f1811de2a408d9165c48a61466b3e 100644
+--- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
++++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
+@@ -66,7 +66,7 @@ public class SuspiciousStewItem extends Item {
+     public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity user) {
+         ItemStack itemStack = super.finishUsingItem(stack, world, user);
+         listPotionEffects(itemStack, (effect) -> {
+-            user.addEffect(effect.createEffectInstance());
++            user.addEffect(effect.createEffectInstance(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper
+         });
+         return user instanceof Player && ((Player)user).getAbilities().instabuild ? itemStack : new ItemStack(Items.BOWL);
+     }