diff --git a/plugin/plugin.yml b/plugin/plugin.yml
index 79bcab7..fff7115 100644
--- a/plugin/plugin.yml
+++ b/plugin/plugin.yml
@@ -1,6 +1,6 @@
 main: lightling.gibsoniacraft.GibsoniaCraft
 name: GibsoniaCraft
-version: 1.1.3
+version: 1.1.4
 author: Lightling
 description: Adds some small additions/changes to a PaperMC server
 api-version: 1.14
\ No newline at end of file
diff --git a/plugin/src/lightling/gibsoniacraft/util/BlockListener.java b/plugin/src/lightling/gibsoniacraft/util/BlockListener.java
index 107fbb3..c20c2b8 100644
--- a/plugin/src/lightling/gibsoniacraft/util/BlockListener.java
+++ b/plugin/src/lightling/gibsoniacraft/util/BlockListener.java
@@ -48,21 +48,19 @@ public class BlockListener implements Listener
 		ItemStack item = player.getInventory().getItemInMainHand();
 		Material itemType = item.getType();
 		
+		// Grab the current block information
+		Block block = bbEvent.getBlock();
+		
 		// Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools
 		if (player != null && (player instanceof Player))
 		{
-			if (player.isSneaking())
+			if (player.isSneaking() || !ToolUtil.IsExcavatable(item, block.getType()) && !ToolUtil.IsHammerable(item, block.getType()))
 			{
 				return;
 			}
-	        if (!ToolUtil.IsExcavator(item) && !ToolUtil.IsHammer(item))
-	        {
-	        	return;
-	        }
 		}
 		
 		// Get blockface information via the player listener
-		Block block = bbEvent.getBlock();
 		String pName = player.getName();
         PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener();
         BlockFace blockFace = pListener.GetFaceByName(pName);
@@ -151,21 +149,20 @@ public class BlockListener implements Listener
 		ItemStack item = player.getInventory().getItemInMainHand();
 		Material itemType = item.getType();
 		
-		// Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools
+		// Get block information via the player listener
+		Block block = bbEvent.getBlock();
+		
+		// Only do extra block-breaking if the player is not sneaking (method of disabling)
+		// Or if the player is breaking the incorrect block/using the incorrect tool
 		if (player != null && (player instanceof Player))
 		{
-			if (player.isSneaking())
+			if (player.isSneaking() || !ToolUtil.IsLumberAxeable(item, block.getType()))
 			{
 				return;
 			}
-	        if (!ToolUtil.IsLumberAxe(item))
-	        {
-	        	return;
-	        }
 		}
 		
-		// Get block information via the player listener
-		Block block = bbEvent.getBlock();
+		// Get all of the relevant blocks that are a part of the tree
 		ArrayList<Block> blocks = ToolUtil.GetUpwardLogs(block);
 		
         // Grab durability information
@@ -178,6 +175,7 @@ public class BlockListener implements Listener
         boolean success = false;
         if (blocks.size() > 1)
         {
+        	System.out.println("Blocks.size() = " + blocks.size());
         	success = true;
         }
         
diff --git a/plugin/src/lightling/gibsoniacraft/util/BlockRef.java b/plugin/src/lightling/gibsoniacraft/util/BlockRef.java
index 7aa19e4..0917a7a 100644
--- a/plugin/src/lightling/gibsoniacraft/util/BlockRef.java
+++ b/plugin/src/lightling/gibsoniacraft/util/BlockRef.java
@@ -46,6 +46,7 @@ public class BlockRef
 		add(Material.END_STONE);
 		add(Material.NETHERRACK);
 		add(Material.NETHER_QUARTZ_ORE);
+		add(Material.OBSIDIAN);
 	}};
 	
 	/**