From f70be2e53d2510a0c0748b75ca49d465e8213a28 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 21 Jul 2011 08:26:26 -0700
Subject: [PATCH] Version 1.0.43

---
 mcMMO/Changelog.txt                                  |  6 ++++++
 .../com/gmail/nossr50/listeners/mcBlockListener.java | 12 ++++++++----
 mcMMO/com/gmail/nossr50/skills/Mining.java           |  6 +++---
 mcMMO/plugin.yml                                     |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mcMMO/Changelog.txt b/mcMMO/Changelog.txt
index 4d402aaff..b1bd35140 100644
--- a/mcMMO/Changelog.txt
+++ b/mcMMO/Changelog.txt
@@ -1,5 +1,11 @@
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
+Version 1.0.43
+Stopped things from being auto-smelt'd
+
+Version 1.0.42
+Corrected 2 more errors involving not running BukkitContrib
+
 Version 1.0.41
 Fixed errors using Tree Feller if your server wasn't running BukkitContrib (sorry!)
 Fixed some more leftover stuff involving the new half-finished mining skill
diff --git a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java
index 38bb14051..5972552bd 100644
--- a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -351,7 +351,8 @@ public class mcBlockListener extends BlockListener {
 			block.getLocation().getWorld().dropItemNaturally(block.getLocation(), item);
 			
 			//Contrib stuff
-			contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+			if(LoadProperties.contribEnabled)
+				contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
     	}
     	/*
     	 * BERSERK MODE CHECKS
@@ -359,7 +360,8 @@ public class mcBlockListener extends BlockListener {
     	if(PP.getBerserkMode() 
     		&& m.blockBreakSimulate(block, player, plugin) 
     		&& player.getItemInHand().getTypeId() == 0 
-    		&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78)){
+    		&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78))
+    	{
 		   	Material mat = Material.getMaterial(block.getTypeId());
 		   	if(block.getTypeId() == 2)
 		   		mat = Material.DIRT;
@@ -371,7 +373,8 @@ public class mcBlockListener extends BlockListener {
 			block.setType(Material.AIR);
 			block.getLocation().getWorld().dropItemNaturally(block.getLocation(), item);
 			
-			contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+			if(LoadProperties.contribEnabled)
+				contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
     	}
     	
     	/*
@@ -404,7 +407,8 @@ public class mcBlockListener extends BlockListener {
     		}
     		block.setType(Material.AIR);
     		player.incrementStatistic(Statistic.MINE_BLOCK, event.getBlock().getType());
-    		contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+    		if(LoadProperties.contribEnabled)
+    			contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
     	}
     	if(block.getType() == Material.AIR && plugin.misc.blockWatchList.contains(block))
     	{
diff --git a/mcMMO/com/gmail/nossr50/skills/Mining.java b/mcMMO/com/gmail/nossr50/skills/Mining.java
index 9f24aeab8..83e59fe9f 100644
--- a/mcMMO/com/gmail/nossr50/skills/Mining.java
+++ b/mcMMO/com/gmail/nossr50/skills/Mining.java
@@ -19,8 +19,8 @@ import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 
 
-public class Mining {
-	
+public class Mining 
+{	
 	public static void superBreakerCheck(Player player, Block block, Plugin pluginx)
 	{
 		PlayerProfile PP = Users.getProfile(player);
@@ -190,7 +190,7 @@ public class Mining {
     	{
     		if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING))
     		{
-	    		blockProcSmeltSimulate(block);
+	    		blockProcSimulate(block);
 				return;
     		}
     	}		
diff --git a/mcMMO/plugin.yml b/mcMMO/plugin.yml
index 9bece8a2a..92fc563e0 100644
--- a/mcMMO/plugin.yml
+++ b/mcMMO/plugin.yml
@@ -1,6 +1,6 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.0.41
+version: 1.0.43
 commands:
     mcc:
         description: Lists mcMMO commands