2022-09-18 05:46:20 +02:00
|
|
|
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
|
2024-01-18 15:56:25 +01:00
|
|
|
index af5db5da4e5b2fd90a5cf0ca3c92e87ba82d4779..b21e180641d17438997a80e5bcb0ec7998d24a2e 100644
|
2022-09-18 05:46:20 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
|
2023-12-06 17:21:56 +01:00
|
|
|
@@ -419,7 +419,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
|
2023-03-14 22:10:53 +01:00
|
|
|
player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, j, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // CraftBukkit
|
2022-09-18 05:46:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
- player.removeEffect(MobEffects.DIG_SLOWDOWN);
|
2024-01-18 15:56:25 +01:00
|
|
|
+ player.removeEffect(MobEffects.DIG_SLOWDOWN, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // Paper - Add missing effect cause
|
2022-09-18 05:46:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
|
2024-01-18 15:56:25 +01:00
|
|
|
index c8e783014a6a09d59e85715a7fbf2a5f65201e77..92266e56200815aa88ebf91bc1ff1a440788275d 100644
|
2022-09-18 05:46:20 +02:00
|
|
|
--- 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);
|
2024-01-18 15:56:25 +01:00
|
|
|
+ user.removeEffect(MobEffects.POISON, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper - Add missing effect cause
|
2022-09-18 05:46:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2024-01-18 15:56:25 +01:00
|
|
|
index 8a7ab376a260bd70a799ce182a03450b3916f733..06ef78580de95bfa0e86f307997664e7b3addaea 100644
|
2022-09-18 05:46:20 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
|
2023-09-22 17:35:51 +02:00
|
|
|
@@ -66,7 +66,7 @@ public class SuspiciousStewItem extends Item {
|
2022-12-07 23:05:32 +01:00
|
|
|
public ItemStack finishUsingItem(ItemStack stack, Level world, LivingEntity user) {
|
|
|
|
ItemStack itemStack = super.finishUsingItem(stack, world, user);
|
2023-09-22 17:35:51 +02:00
|
|
|
listPotionEffects(itemStack, (effect) -> {
|
|
|
|
- user.addEffect(effect.createEffectInstance());
|
2024-01-18 15:56:25 +01:00
|
|
|
+ user.addEffect(effect.createEffectInstance(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper - Add missing effect cause
|
2023-09-22 17:35:51 +02:00
|
|
|
});
|
2022-12-07 23:05:32 +01:00
|
|
|
return user instanceof Player && ((Player)user).getAbilities().instabuild ? itemStack : new ItemStack(Items.BOWL);
|
|
|
|
}
|