40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
--- a/net/minecraft/world/item/consume_effects/ConsumeEffect.java
|
|
+++ b/net/minecraft/world/item/consume_effects/ConsumeEffect.java
|
|
@@ -12,6 +12,10 @@
|
|
import net.minecraft.world.item.ItemStack;
|
|
import net.minecraft.world.level.World;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityPotionEffectEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public interface ConsumeEffect {
|
|
|
|
Codec<ConsumeEffect> CODEC = BuiltInRegistries.CONSUME_EFFECT_TYPE.byNameCodec().dispatch(ConsumeEffect::getType, ConsumeEffect.a::codec);
|
|
@@ -19,7 +23,15 @@
|
|
|
|
ConsumeEffect.a<? extends ConsumeEffect> getType();
|
|
|
|
- boolean apply(World world, ItemStack itemstack, EntityLiving entityliving);
|
|
+ // CraftBukkit start
|
|
+ default boolean apply(World world, ItemStack itemstack, EntityLiving entityliving) {
|
|
+ return this.apply(world, itemstack, entityliving, EntityPotionEffectEvent.Cause.UNKNOWN);
|
|
+ }
|
|
+
|
|
+ default boolean apply(World world, ItemStack itemstack, EntityLiving entityliving, EntityPotionEffectEvent.Cause cause) {
|
|
+ return this.apply(world, itemstack, entityliving);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
public static record a<T extends ConsumeEffect>(MapCodec<T> codec, StreamCodec<RegistryFriendlyByteBuf, T> streamCodec) {
|
|
|
|
@@ -30,7 +42,7 @@
|
|
public static final ConsumeEffect.a<PlaySoundConsumeEffect> PLAY_SOUND = register("play_sound", PlaySoundConsumeEffect.CODEC, PlaySoundConsumeEffect.STREAM_CODEC);
|
|
|
|
private static <T extends ConsumeEffect> ConsumeEffect.a<T> register(String s, MapCodec<T> mapcodec, StreamCodec<RegistryFriendlyByteBuf, T> streamcodec) {
|
|
- return (ConsumeEffect.a) IRegistry.register(BuiltInRegistries.CONSUME_EFFECT_TYPE, s, new ConsumeEffect.a(mapcodec, streamcodec));
|
|
+ return (ConsumeEffect.a) IRegistry.register(BuiltInRegistries.CONSUME_EFFECT_TYPE, s, new ConsumeEffect.a<>(mapcodec, streamcodec)); // CraftBukkit - decompile error
|
|
}
|
|
}
|
|
}
|