From d643982dd38e5539611f27fd9b6f08968402dfde Mon Sep 17 00:00:00 2001
From: Tristan van den Elzen <Tristan.vd.Elzen@outlook.com>
Date: Tue, 23 Jul 2019 01:46:54 +0200
Subject: [PATCH] Merge branch 'pr/194'

---
 src/com/dre/brewery/BCauldron.java                | 3 +--
 src/com/dre/brewery/LegacyUtil.java               | 6 ++++++
 src/com/dre/brewery/listeners/PlayerListener.java | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/dre/brewery/BCauldron.java b/src/com/dre/brewery/BCauldron.java
index 867d099..85727f0 100644
--- a/src/com/dre/brewery/BCauldron.java
+++ b/src/com/dre/brewery/BCauldron.java
@@ -5,7 +5,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Levelled;
 import org.bukkit.entity.Player;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
@@ -36,7 +35,7 @@ public class BCauldron {
 
 	public void onUpdate() {
 		// Check if fire still alive
-		if (!Util.isChunkLoaded(block) || block.getRelative(BlockFace.DOWN).getType() == Material.FIRE || LegacyUtil.isLava(block.getRelative(BlockFace.DOWN).getType())) {
+		if (!Util.isChunkLoaded(block) || LegacyUtil.isFireForCauldron(block.getRelative(BlockFace.DOWN).getType())) {
 			// add a minute to cooking time
 			state++;
 			if (someRemoved) {
diff --git a/src/com/dre/brewery/LegacyUtil.java b/src/com/dre/brewery/LegacyUtil.java
index c620fbc..2d4bfd1 100644
--- a/src/com/dre/brewery/LegacyUtil.java
+++ b/src/com/dre/brewery/LegacyUtil.java
@@ -104,6 +104,12 @@ public class LegacyUtil {
 		return type.name().endsWith("SIGN") || (!P.use1_13 && type == SIGN_POST);
 	}
 
+	public static boolean isFireForCauldron(Material type) {
+		return type == Material.FIRE
+		|| type == Material.CAMPFIRE
+		|| LegacyUtil.isLava(type);
+	}
+
 	// LAVA and STATIONARY_LAVA are merged as of 1.13
 	public static boolean isLava(Material type) {
 		return type == Material.LAVA || (!P.use1_13 && type == STATIONARY_LAVA) || (MAGMA != null && type == MAGMA);
diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java
index 85fc77c..d6a9d12 100644
--- a/src/com/dre/brewery/listeners/PlayerListener.java
+++ b/src/com/dre/brewery/listeners/PlayerListener.java
@@ -78,7 +78,7 @@ public class PlayerListener implements Listener {
 
 						// Check if fire alive below cauldron when adding ingredients
 						Block down = clickedBlock.getRelative(BlockFace.DOWN);
-						if (down.getType() == Material.FIRE || LegacyUtil.isLava(down.getType())) {
+						if (LegacyUtil.isFireForCauldron(down.getType())) {
 
 							event.setCancelled(true);
 							boolean handSwap = false;