diff --git a/patches/server/0014-Add-regen-effect-to-campfires.patch b/patches/server/0014-Add-regen-effect-to-campfires.patch index ccdf68398..c3b5c43c8 100644 --- a/patches/server/0014-Add-regen-effect-to-campfires.patch +++ b/patches/server/0014-Add-regen-effect-to-campfires.patch @@ -1,4 +1,4 @@ -From b26a3bb41ca58ca161ed36cefe2773bce4e5ac1b Mon Sep 17 00:00:00 2001 +From 501ec3f6de8125b8778abc19caf2961b5584cfab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 May 2019 18:11:53 -0500 Subject: [PATCH] Add regen effect to campfires @@ -151,7 +151,7 @@ index 2317adde..f112a848 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 30f11fe2..22b6a0fd 100644 +index 30f11fe2..314fd584 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -60,4 +60,27 @@ public class PurpurWorldConfig { @@ -179,7 +179,7 @@ index 30f11fe2..22b6a0fd 100644 + campfireRegenBoostRange = getInt("campfire-regen.boost-range", campfireRegenBoostRange); + campfireRegenBoostAmp = getInt("campfire-regen.boost-amplifier", campfireRegenBoostAmp); + campfireRegenBoostRequireLineOfSight = getBoolean("campfire-regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight); -+ campfireRequireRegenPotion = getBoolean("campfire-regn.requires-regen-potion-to-activate", campfireRequireRegenPotion); ++ campfireRequireRegenPotion = getBoolean("campfire-regen.requires-regen-potion-to-activate", campfireRequireRegenPotion); + } } -- diff --git a/patches/server/0016-Campfires-burn-out-in-rain.patch b/patches/server/0016-Campfires-burn-out-in-rain.patch index e8f36c0fe..4f76c79a8 100644 --- a/patches/server/0016-Campfires-burn-out-in-rain.patch +++ b/patches/server/0016-Campfires-burn-out-in-rain.patch @@ -1,4 +1,4 @@ -From da3b9e3e06081d66b950b038a91819ef7e41e9b4 Mon Sep 17 00:00:00 2001 +From db147d56a6690f1f4427813c31df18ef8730c538 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 21:30:49 -0500 Subject: [PATCH] Campfires burn out in rain @@ -23,12 +23,12 @@ index d2363d1d..563f16a3 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 09971838..4e8f0b03 100644 +index 871c0e23..8d1f3feb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -88,4 +88,9 @@ public class PurpurWorldConfig { campfireRegenBoostRequireLineOfSight = getBoolean("campfire-regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight); - campfireRequireRegenPotion = getBoolean("campfire-regn.requires-regen-potion-to-activate", campfireRequireRegenPotion); + campfireRequireRegenPotion = getBoolean("campfire-regen.requires-regen-potion-to-activate", campfireRequireRegenPotion); } + + public boolean campfiresGoOutInRain = true;