diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 94324e8ac..10986900d 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -240,6 +240,11 @@ items-can-break-turtle-eggs * **default**: false * **description**: Allow dropped items to damage/break turtle eggs +milk-cures-bad-omen +~~~~~~~~~~~~~~~~~~~ +* **default**: false +* **description**: Allow players to drink milk to cure bad omen status effect + block-tick-events ~~~~~~~~~~~~~~~~~ * **default**: true diff --git a/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch new file mode 100644 index 000000000..ca5b06fe5 --- /dev/null +++ b/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch @@ -0,0 +1,43 @@ +From dc3aaf12abc1d8aff4345c7758ae801f83f64a39 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Wed, 10 Jul 2019 20:43:05 -0500 +Subject: [PATCH] Option to toggle milk curing bad omen + +--- + src/main/java/net/minecraft/server/ItemMilkBucket.java | 2 ++ + src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java +index a6477d26a..f76e611ca 100644 +--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java ++++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java +@@ -20,7 +20,9 @@ public class ItemMilkBucket extends Item { + } + + if (!world.isClientSide) { ++ MobEffect badOmen = entityliving.getEffect(MobEffects.BAD_OMEN); // Purpur + entityliving.removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.MILK); // CraftBukkit ++ if (!world.purpurConfig.milkCuresBadOmen && badOmen != null) entityliving.addEffect(badOmen); // Purpur + } + + return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack; +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index 542e1b329..3ec048adf 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -117,6 +117,11 @@ public class PurpurWorldConfig { + itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs); + } + ++ public boolean milkCuresBadOmen = false; ++ private void milkCuresBadOmen() { ++ milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen); ++ } ++ + public boolean blockTickEvent = true; + public boolean fluidTickEvent = true; + private void tickEvents() { +-- +2.20.1 +