diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index 355301042..81da62cab 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -57,6 +59,11 @@ public class AcrobaticsCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Acrobatics" }) })); + } + if (canRoll) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index c6fe0c82d..bc65ebda4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -64,6 +66,11 @@ public class ArcheryCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.archery")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Archery" }) })); + } + if (canSkillShot) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index b81ed59ec..f88abb625 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -66,6 +68,11 @@ public class AxesCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.axes")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Axes" }) })); + } + if (canSkullSplitter) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index 8dbcbfb2d..7294a3980 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -1,5 +1,7 @@ package com.gmail.nossr50.commands.skills; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -36,6 +38,11 @@ public class ExcavationCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.excavation")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Excavation" }) })); + } + if (canGigaDrill) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index e3a031951..7e88da248 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -1,5 +1,7 @@ package com.gmail.nossr50.commands.skills; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -68,6 +70,11 @@ public class FishingCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.fishing")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Fishing" }) })); + } + if (canTreasureHunt) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index 39e8e15bd..98e4f1060 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; @@ -76,6 +78,11 @@ public class HerbalismCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Herbalism" }) })); + } + if (canGreenTerra) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java index ecdd3474c..255c4f093 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; @@ -114,6 +116,11 @@ public class MiningCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.mining")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Mining" }) })); + } + if (canSuperBreaker) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index dc444b1df..3934c0eb8 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; @@ -91,6 +93,11 @@ public class RepairCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.repair")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Repair" }) })); + } + player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") })); if (canMasterRepair) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 952053f92..77ee6e78c 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -63,6 +65,11 @@ public class SwordsCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.swords")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Swords" }) })); + } + if (canCounter) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index 649767097..bf0106562 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; @@ -60,6 +62,11 @@ public class TamingCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.taming")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Taming" }) })); + } + Config configInstance = Config.getInstance(); if (canBeastLore) { diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index a81603e1e..5c36507b6 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.datatypes.SkillType; @@ -61,6 +63,11 @@ public class UnarmedCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.unarmed")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Unarmed" }) })); + } + if (canBerserk) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 5cc761ef3..6eb338a02 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -2,6 +2,8 @@ package com.gmail.nossr50.commands.skills; import java.text.DecimalFormat; +import org.bukkit.ChatColor; + import com.gmail.nossr50.commands.SkillCommand; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; @@ -53,6 +55,11 @@ public class WoodcuttingCommand extends SkillCommand { @Override protected void effectsDisplay() { + if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) { + String perkPrefix = ChatColor.RED + "[mcMMO Perks] "; + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Woodcutting" }) })); + } + if (canTreeFell) { player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") })); } diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 87c6cc80c..6acd9edbb 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -298,14 +298,6 @@ public class BlockListener implements Listener { Block block = event.getBlock(); Material material = block.getType(); - FakeBlockBreakEvent fakeEvent = new FakeBlockBreakEvent(block, player); - mcMMO.p.getServer().getPluginManager().callEvent(fakeEvent); - - if(fakeEvent.isCancelled()) - return; - else - fakeEvent.setCancelled(true); - Config configInstance = Config.getInstance(); Permissions permInstance = Permissions.getInstance(); diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 11ebcc176..c47f2b8ca 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -238,40 +238,40 @@ public class PlayerListener implements Listener { } if (player.hasPermission("mcmmo.perks.lucky.acrobatics")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Acrobatics" }) })); + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.archery")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Archery" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.archery")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.axes")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Axes" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.axes")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.excavation")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Excavation" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.excavation")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.fishing")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Fishing" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.fishing")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Herbalism" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.herbalism")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.mining")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Mining" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.mining")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.repair")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Repair" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.repair")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.swords")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Swords" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.swords")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.taming")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Taming" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.taming")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.unarmed")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Unarmed" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.unarmed")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } - if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) { - player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { "Woodcutting" }) })); + else if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) { + player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc.login") })); } player.sendMessage(ChatColor.GOLD+"[mcMMO] " + ChatColor.GREEN + "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index a45df4579..104d3207d 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -451,6 +451,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_cy.properties b/src/main/resources/locale/locale_cy.properties index 1f36c3cc2..8ab0fb4b0 100644 --- a/src/main/resources/locale/locale_cy.properties +++ b/src/main/resources/locale/locale_cy.properties @@ -451,6 +451,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 2fc49a8ad..f947b6caf 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -451,6 +451,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 60562c187..ff0a83147 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 7187215b6..c284ab5ad 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -534,6 +534,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index 42e4f71df..73cd5d30b 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index c67687664..dd6775cfe 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index a2a51e8c4..963cbccf7 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index 746248479..258132ddb 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index 864d0c576..d53908260 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index bcfb54450..e11a79e48 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index ba29dc644..7f528e140 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 0cde5e639..d40b591e1 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index e37642bf3..60b69286a 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index 8e2503107..f96a3233e 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index a73d5510d..3d719dd00 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index 6c181d226..feb41ffd3 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_tr_TR.properties b/src/main/resources/locale/locale_tr_TR.properties index a32b0df94..29838fd3d 100644 --- a/src/main/resources/locale/locale_tr_TR.properties +++ b/src/main/resources/locale/locale_tr_TR.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance diff --git a/src/main/resources/locale/locale_zh_CN.properties b/src/main/resources/locale/locale_zh_CN.properties index 242a0fd78..f187ecb9a 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/src/main/resources/locale/locale_zh_CN.properties @@ -452,6 +452,7 @@ Perks.xp.name=Experience Perks.xp.desc=Receive {0}x XP. Perks.lucky.name=Luck Perks.lucky.desc=Gives {0} skills and abilities a 33.3% better chance to activate. +Perks.lucky.desc.login=Gives certain skills and abilities a 33.3% better chance to activate. Perks.cooldowns.name=Fast Recovery Perks.cooldowns.desc=Cuts cooldown duration by {0}. Perks.activationtime.name=Endurance