Browse Source

Version 1.0.43

nossr50 14 years ago
parent
commit
f70be2e53d

+ 6 - 0
mcMMO/Changelog.txt

@@ -1,5 +1,11 @@
 Changelog:
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
 #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
 Version 1.0.41
 Fixed errors using Tree Feller if your server wasn't running BukkitContrib (sorry!)
 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
 Fixed some more leftover stuff involving the new half-finished mining skill

+ 8 - 4
mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java

@@ -351,7 +351,8 @@ public class mcBlockListener extends BlockListener {
 			block.getLocation().getWorld().dropItemNaturally(block.getLocation(), item);
 			block.getLocation().getWorld().dropItemNaturally(block.getLocation(), item);
 			
 			
 			//Contrib stuff
 			//Contrib stuff
-			contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+			if(LoadProperties.contribEnabled)
+				contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
     	}
     	}
     	/*
     	/*
     	 * BERSERK MODE CHECKS
     	 * BERSERK MODE CHECKS
@@ -359,7 +360,8 @@ public class mcBlockListener extends BlockListener {
     	if(PP.getBerserkMode() 
     	if(PP.getBerserkMode() 
     		&& m.blockBreakSimulate(block, player, plugin) 
     		&& m.blockBreakSimulate(block, player, plugin) 
     		&& player.getItemInHand().getTypeId() == 0 
     		&& player.getItemInHand().getTypeId() == 0 
-    		&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78)){
+    		&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78))
+    	{
 		   	Material mat = Material.getMaterial(block.getTypeId());
 		   	Material mat = Material.getMaterial(block.getTypeId());
 		   	if(block.getTypeId() == 2)
 		   	if(block.getTypeId() == 2)
 		   		mat = Material.DIRT;
 		   		mat = Material.DIRT;
@@ -371,7 +373,8 @@ public class mcBlockListener extends BlockListener {
 			block.setType(Material.AIR);
 			block.setType(Material.AIR);
 			block.getLocation().getWorld().dropItemNaturally(block.getLocation(), item);
 			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);
     		block.setType(Material.AIR);
     		player.incrementStatistic(Statistic.MINE_BLOCK, event.getBlock().getType());
     		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))
     	if(block.getType() == Material.AIR && plugin.misc.blockWatchList.contains(block))
     	{
     	{

+ 3 - 3
mcMMO/com/gmail/nossr50/skills/Mining.java

@@ -19,8 +19,8 @@ import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.locale.mcLocale;
 
 
 
 
-public class Mining {
-	
+public class Mining 
+{	
 	public static void superBreakerCheck(Player player, Block block, Plugin pluginx)
 	public static void superBreakerCheck(Player player, Block block, Plugin pluginx)
 	{
 	{
 		PlayerProfile PP = Users.getProfile(player);
 		PlayerProfile PP = Users.getProfile(player);
@@ -190,7 +190,7 @@ public class Mining {
     	{
     	{
     		if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING))
     		if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING))
     		{
     		{
-	    		blockProcSmeltSimulate(block);
+	    		blockProcSimulate(block);
 				return;
 				return;
     		}
     		}
     	}		
     	}		

+ 1 - 1
mcMMO/plugin.yml

@@ -1,6 +1,6 @@
 name: mcMMO
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.0.41
+version: 1.0.43
 commands:
 commands:
     mcc:
     mcc:
         description: Lists mcMMO commands
         description: Lists mcMMO commands