Make sure campfire is lit

DieReicheErethons · Aug 18, 2019 · 86f2cd7 · 86f2cd7
1 parent ee02426
commit 86f2cd7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/com/dre/brewery/BCauldron.java b/src/com/dre/brewery/BCauldron.java
@@ -35,7 +35,7 @@ public BCauldron(Block block, BIngredients ingredients, int state) {
 
 	public void onUpdate() {
 		// Check if fire still alive
-		if (!Util.isChunkLoaded(block) || LegacyUtil.isFireForCauldron(block.getRelative(BlockFace.DOWN).getType())) {
+		if (!Util.isChunkLoaded(block) || LegacyUtil.isFireForCauldron(block.getRelative(BlockFace.DOWN))) {
 			// 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
@@ -105,15 +105,26 @@ public static boolean isSign(Material type) {
 		return type.name().endsWith("SIGN") || (!P.use1_13 && type == SIGN_POST);
 	}
 
-	public static boolean isFireForCauldron(Material type) {
-		return type != null && (type == Material.FIRE || type == CAMPFIRE || type == MAGMA_BLOCK || isLava(type));
+	public static boolean isFireForCauldron(Block block) {
+		Material type = block.getType();
+		return type != null && (type == Material.FIRE || type == MAGMA_BLOCK || litCampfire(block) || 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);
 	}
 
+	public static boolean litCampfire(Block block) {
+		if (block.getType() == CAMPFIRE) {
+			BlockData data = block.getBlockData();
+			if (data instanceof org.bukkit.block.data.Lightable) {
+				return ((org.bukkit.block.data.Lightable) data).isLit();
+			}
+		}
+		return false;
+	}
+
 	public static boolean areStairsInverted(Block block) {
 		if (!P.use1_13) {
 			@SuppressWarnings("deprecation")

diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java
@@ -80,7 +80,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 
 						// Check if fire alive below cauldron when adding ingredients
 						Block down = clickedBlock.getRelative(BlockFace.DOWN);
-						if (LegacyUtil.isFireForCauldron(down.getType())) {
+						if (LegacyUtil.isFireForCauldron(down)) {
 
 							event.setCancelled(true);
 							boolean handSwap = false;