mirror of
https://github.com/PurpurMC/Purpur.git
synced 2025-02-23 13:09:31 +08:00
Option to toggle milk curing bad omen
This commit is contained in:
parent
662d02c216
commit
d5113e44c2
@ -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
|
||||
|
@ -0,0 +1,43 @@
|
||||
From dc3aaf12abc1d8aff4345c7758ae801f83f64a39 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user