Bläddra i källkod

Merge pull request #324 from Glitchfinder/fixes

Further fixes and refinements.
Grant 12 år sedan
förälder
incheckning
9854360ab7
33 ändrade filer med 126 tillägg och 31 borttagningar
  1. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
  2. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
  3. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
  4. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
  5. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
  6. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
  7. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
  8. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
  9. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
  10. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
  11. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
  12. 7 0
      src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
  13. 0 8
      src/main/java/com/gmail/nossr50/listeners/BlockListener.java
  14. 23 23
      src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
  15. 1 0
      src/main/resources/locale/locale_cs_CZ.properties
  16. 1 0
      src/main/resources/locale/locale_cy.properties
  17. 1 0
      src/main/resources/locale/locale_da.properties
  18. 1 0
      src/main/resources/locale/locale_de.properties
  19. 1 0
      src/main/resources/locale/locale_en_US.properties
  20. 1 0
      src/main/resources/locale/locale_es.properties
  21. 1 0
      src/main/resources/locale/locale_fi.properties
  22. 1 0
      src/main/resources/locale/locale_fr.properties
  23. 1 0
      src/main/resources/locale/locale_it.properties
  24. 1 0
      src/main/resources/locale/locale_ko.properties
  25. 1 0
      src/main/resources/locale/locale_lv.properties
  26. 1 0
      src/main/resources/locale/locale_nl.properties
  27. 1 0
      src/main/resources/locale/locale_no.properties
  28. 1 0
      src/main/resources/locale/locale_pl.properties
  29. 1 0
      src/main/resources/locale/locale_pt_BR.properties
  30. 1 0
      src/main/resources/locale/locale_ru.properties
  31. 1 0
      src/main/resources/locale/locale_sv.properties
  32. 1 0
      src/main/resources/locale/locale_tr_TR.properties
  33. 1 0
      src/main/resources/locale/locale_zh_CN.properties

+ 7 - 0
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") }));
 		}

+ 7 - 0
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") }));
 		}

+ 7 - 0
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") }));
         }

+ 7 - 0
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") }));
         }

+ 7 - 0
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") }));
         }

+ 7 - 0
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") }));
         }

+ 7 - 0
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") }));
         }

+ 7 - 0
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) {

+ 7 - 0
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") }));
         }

+ 7 - 0
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) {

+ 7 - 0
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") }));
         }

+ 7 - 0
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") }));
         }

+ 0 - 8
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();
 

+ 23 - 23
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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