Version 1.1.13

mcMMO/Changelog.txt

@@ -1,5 +1,8 @@
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
+Version 1.1.13
+Pets are removed from party bars
+
 Version 1.1.12
 mcMMO now downloads files when you join the server to provide the best experience
 mcMMO now uses a brand new Party HUD by Rycochet (from his mmoParty plugin)
@@ -7,6 +10,7 @@ Fixed the xpbar and xpicon settings in config to work properly
 Fixed infinite HP exploit with Herbalism
 Fixed bug where herbalism would heal out of the players normal health range
 Fixed bug where entering ':' into your party name caused stat loss among other things
+Fixed issue with block break listener priority
 
 Version 1.1.11
 mcMMO now properly cancels its Async taks when disabled

mcMMO/com/gmail/nossr50/Combat.java

@@ -42,8 +42,8 @@ public class Combat
 				//Damage modifiers
 				if(mcPermissions.getInstance().unarmed(attacker) && attacker.getItemInHand().getTypeId() == 0) //Unarmed
 					Unarmed.unarmedBonus(attacker, eventb);
-				if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker) && PPa.getSkillLevel(SkillType.AXES) >= 500)
-						event.setDamage(event.getDamage()+4);
+				if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker) && Users.getProfile(attacker).getSkillLevel(SkillType.AXES) >= 500)
+				    event.setDamage(event.getDamage()+4);
 				
 				//If there are any abilities to activate
 		    	combatAbilityChecks(attacker, PPa, pluginx);

mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java

@@ -97,8 +97,6 @@ public class mcBlockListener extends BlockListener
     
     public void onBlockBreak(BlockBreakEvent event) 
     {
-    	
-    	
     	Player player = event.getPlayer();
     	PlayerProfile PP = Users.getProfile(player);
     	Block block = event.getBlock();

mcMMO/com/gmail/nossr50/locale/locale_en_us.properties

@@ -99,7 +99,7 @@ m.EffectsAxes1_0=Skull Splitter (ABILITY)
 m.EffectsAxes1_1=Deal AoE Damage
 m.EffectsAxes2_0=Critical Strikes
 m.EffectsAxes2_1=Double Damage
-m.EffectsAxes3_0=Axe Mastery (500 SKILL)
+m.EffectsAxes3_0=Axe Mastery
 m.EffectsAxes3_1=Modifies Damage
 m.AbilLockAxes1=LOCKED UNTIL 500+ SKILL (AXEMASTERY)
 m.AbilBonusAxes1_0=Axe Mastery

mcMMO/com/gmail/nossr50/spout/mmoHelper.java

@@ -191,9 +191,9 @@ public class mmoHelper
 	
 	public static void update(Player player) 
 	{
-		boolean show_pets = true;
+		//boolean show_pets = true;
 		Container container = containers.get(player);
-
+		
 		if (container != null) 
 		{
 			int index = 0;
@@ -208,7 +208,7 @@ public class mmoHelper
 					bar = (GenericLivingEntity)bars[index];
 				}
 				bar.setEntity(name, Party.getInstance().isPartyLeader(Bukkit.getServer().getPlayer(name), Users.getProfile(Bukkit.getServer().getPlayer(name)).getParty()) ? ChatColor.GREEN + "@" : "");
-				bar.setTargets(show_pets ? getPets(Bukkit.getServer().getPlayer(name)) : null);
+				//bar.setTargets(show_pets ? getPets(Bukkit.getServer().getPlayer(name)) : null);
 				index++;
 			}
 			while (index < bars.length) {

mcMMO/plugin.yml

@@ -1,6 +1,6 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.1.12
+version: 1.1.13
 softdepend: [Spout]
 commands:
     mchud: