From da3b9e3e06081d66b950b038a91819ef7e41e9b4 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 --- src/main/java/net/minecraft/server/BlockCampfire.java | 3 +++ src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java index d2363d1d..563f16a3 100644 --- a/src/main/java/net/minecraft/server/BlockCampfire.java +++ b/src/main/java/net/minecraft/server/BlockCampfire.java @@ -86,6 +86,9 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged if (iblockdata.get(BlockCampfire.d) && iblockdata.get(BlockCampfire.b)) { world.setTypeAndData(pos, iblockdata.set(BlockCampfire.b, false), 3); } + if (world.purpurConfig.campfiresGoOutInRain && world.getTime() % 20 == 0L && iblockdata.get(BlockCampfire.b) && world.isRainingAt(pos.shift(EnumDirection.UP))) { + world.setTypeAndData(pos, iblockdata.set(BlockCampfire.b, false), 3); + } world.getBlockTickList().a(pos, this, tickRate(world)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 09971838..4e8f0b03 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); } + + public boolean campfiresGoOutInRain = true; + private void campfiresGoOutInRain() { + campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain); + } } -- 2.20.1