diff --git a/mcMMO/Changelog.txt b/mcMMO/Changelog.txt index b1bd35140..0b66e60f7 100644 --- a/mcMMO/Changelog.txt +++ b/mcMMO/Changelog.txt @@ -1,5 +1,19 @@ Changelog: #Versions without changelogs probably had very small misc fixes, like tweaks to the source code +Version 1.0.47 +Fixed another BukkitContrib error for servers not running BukkitContrib + +Version 1.0.46 +Fixed bug preventing Excavation from gaining skill + +Version 1.0.45 +Corrected /stats showing Repair XP as Level for Repair +Corrected /repair showing Repair XP as Level for Repair +Corrected /whois showing Repair XP as Level for Repair + +Version 1.0.44 +Fixed my 'fix' of BukkitContrib errors with Tree Feller + Version 1.0.43 Stopped things from being auto-smelt'd diff --git a/mcMMO/com/gmail/nossr50/contrib/contribStuff.java b/mcMMO/com/gmail/nossr50/contrib/contribStuff.java index bd314f507..7981b7a00 100644 --- a/mcMMO/com/gmail/nossr50/contrib/contribStuff.java +++ b/mcMMO/com/gmail/nossr50/contrib/contribStuff.java @@ -12,7 +12,6 @@ import org.bukkitcontrib.sound.SoundManager; import com.gmail.nossr50.Users; import com.gmail.nossr50.m; -import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; @@ -20,8 +19,6 @@ public class contribStuff { public static void playSoundForPlayer(SoundEffect effect, Player player, Location location) { - if(!LoadProperties.contribEnabled) - return; //Contrib stuff ContribPlayer cPlayer = ContribCraftPlayer.getContribPlayer(player); SoundManager SM = BukkitContrib.getSoundManager(); diff --git a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java index 5972552bd..aa954ae24 100644 --- a/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java @@ -189,7 +189,9 @@ public class mcBlockListener extends BlockListener { && block.getTypeId() == 17 && m.blockBreakSimulate(block, player, plugin)) { - contribStuff.playSoundForPlayer(SoundEffect.EXPLODE, player, block.getLocation()); + if(LoadProperties.contribEnabled) + contribStuff.playSoundForPlayer(SoundEffect.EXPLODE, player, block.getLocation()); + WoodCutting.treeFeller(block, player, plugin); for(Block blockx : plugin.misc.treeFeller) { diff --git a/mcMMO/com/gmail/nossr50/locale/mcLocale.java b/mcMMO/com/gmail/nossr50/locale/mcLocale.java index 6aa812610..321b7806a 100644 --- a/mcMMO/com/gmail/nossr50/locale/mcLocale.java +++ b/mcMMO/com/gmail/nossr50/locale/mcLocale.java @@ -37,7 +37,8 @@ public class mcLocale String output = RESOURCE_BUNDLE.getString(key); - if (messageArguments != null) { + if (messageArguments != null) + { MessageFormat formatter = new MessageFormat(""); formatter.applyPattern(output); output = formatter.format(messageArguments); diff --git a/mcMMO/com/gmail/nossr50/mcMMO.java b/mcMMO/com/gmail/nossr50/mcMMO.java index 7fc1834c3..bfe0a266a 100644 --- a/mcMMO/com/gmail/nossr50/mcMMO.java +++ b/mcMMO/com/gmail/nossr50/mcMMO.java @@ -474,13 +474,13 @@ public class mcMMO extends JavaPlugin player.sendMessage(mcLocale.getString("m.MiningSuperBreakerLength", new Object[] {ticks})); } else if(label.equalsIgnoreCase("repair") || split[0].toLowerCase().equalsIgnoreCase(mcLocale.getString("m.SkillRepair").toLowerCase())){ - float skillvalue = (float)PP.getSkillXpLevel(SkillType.REPAIR); + float skillvalue = (float)PP.getSkillLevel(SkillType.REPAIR); String percentage = String.valueOf((skillvalue / 1000) * 100); String repairmastery = String.valueOf((skillvalue / 500) * 100); player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] {mcLocale.getString("m.SkillRepair")})); player.sendMessage(mcLocale.getString("m.XPGain", new Object[] {mcLocale.getString("m.XPGainRepair")})); if(mcPermissions.getInstance().repair(player)) - player.sendMessage(mcLocale.getString("m.LVL", new Object[] {PP.getSkillXpLevel(SkillType.REPAIR), PP.getSkillLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)})); + player.sendMessage(mcLocale.getString("m.LVL", new Object[] {PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)})); player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] {mcLocale.getString("m.Effects")})); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] {mcLocale.getString("m.EffectsRepair1_0"), mcLocale.getString("m.EffectsRepair1_1")})); player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] {mcLocale.getString("m.EffectsRepair2_0"), mcLocale.getString("m.EffectsRepair2_1")})); @@ -1117,7 +1117,7 @@ public class mcMMO extends JavaPlugin if(mcPermissions.getInstance().acrobatics(target)) player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS))); if(mcPermissions.getInstance().repair(target)) - player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR))); + player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR))); player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") +ChatColor.GREEN+(m.getPowerLevel(target))); @@ -1172,7 +1172,7 @@ public class mcMMO extends JavaPlugin if(mcPermissions.getInstance().acrobatics(player)) player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS))); if(mcPermissions.getInstance().repair(player)) - player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillXpLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR))); + player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR))); } player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel")+ChatColor.GREEN+(m.getPowerLevel(player))); } diff --git a/mcMMO/com/gmail/nossr50/skills/Excavation.java b/mcMMO/com/gmail/nossr50/skills/Excavation.java index ac8827813..0317e7697 100644 --- a/mcMMO/com/gmail/nossr50/skills/Excavation.java +++ b/mcMMO/com/gmail/nossr50/skills/Excavation.java @@ -68,7 +68,7 @@ public class Excavation PlayerProfile PP = Users.getProfile(player); ItemStack is = null; Material mat = null; - if(data != (byte) 5) + if(data == (byte) 5) return; if(type == 2) diff --git a/mcMMO/com/gmail/nossr50/skills/Mining.java b/mcMMO/com/gmail/nossr50/skills/Mining.java index 83e59fe9f..e1da38034 100644 --- a/mcMMO/com/gmail/nossr50/skills/Mining.java +++ b/mcMMO/com/gmail/nossr50/skills/Mining.java @@ -476,8 +476,8 @@ public class Mining } if(block.getData() != (byte) 5) PP.addXP(SkillType.MINING, xp * LoadProperties.xpGainMultiplier); - - contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation()); + if(LoadProperties.contribEnabled) + contribStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation()); Skills.XpCheckSkill(SkillType.MINING, player); } diff --git a/mcMMO/plugin.yml b/mcMMO/plugin.yml index 92fc563e0..9b45f0252 100644 --- a/mcMMO/plugin.yml +++ b/mcMMO/plugin.yml @@ -1,6 +1,6 @@ name: mcMMO main: com.gmail.nossr50.mcMMO -version: 1.0.43 +version: 1.0.47 commands: mcc: description: Lists mcMMO commands @@ -91,7 +91,7 @@ permissions: default: op description: mcmmo permissions that default to op children: - mcmmo.admin: true + mcmmo.admin: false mcmmo.tools.*: true mcmmo.chat.adminchat: true