From dbda8874577811ef644c8e2b5598c7c15d2d3fcd Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Sun, 18 Sep 2022 05:46:20 +0200 Subject: Missing some effect cause (#8307) --- patches/server/0940-Missing-effect-cause.patch | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 patches/server/0940-Missing-effect-cause.patch diff --git a/patches/server/0940-Missing-effect-cause.patch b/patches/server/0940-Missing-effect-cause.patch new file mode 100644 index 0000000000..70a763eeb3 --- /dev/null +++ b/patches/server/0940-Missing-effect-cause.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> +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 da5e6141f548539cac720aba558e1b6f3a87e474..e7467fec2cab37c1a9933d1096724e3732913590 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 +@@ -433,7 +433,7 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable { + player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, i, 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 b9dbe5301b04cb1aa5da3a3ee7560c806ce6a411..c8d6b5e60b6c8c612fa8580c63a32c4a8f8b0a7b 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 494d1e8e12f15366a77c732271b46fdb9fb28ad1..3f0ee0141b46dcc70bd6b21921503dafa9c847a6 100644 +--- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java ++++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java +@@ -43,7 +43,7 @@ public class SuspiciousStewItem extends Item { + + MobEffect mobEffect = MobEffect.byId(compoundTag2.getInt("EffectId")); + if (mobEffect != null) { +- user.addEffect(new MobEffectInstance(mobEffect, j)); ++ user.addEffect(new MobEffectInstance(mobEffect, j), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper + } + } + } -- cgit v1.2.3