Bläddra i källkod

More work on commands.

GJ 13 år sedan
förälder
incheckning
eb7a0143da

+ 2 - 0
src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java

@@ -82,6 +82,8 @@ public class InspectCommand implements CommandExecutor {
                 sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
             }
 
+            return true;
+
         default:
             sender.sendMessage(usage);
             return true;

+ 3 - 3
src/main/java/com/gmail/nossr50/skills/Repair.java

@@ -427,10 +427,10 @@ public class Repair {
         short newDurability = getRepairAmount(item, player);
         PlayerInventory inventory = player.getInventory();
 
-        McMMOPlayerRepairCheckEvent preEvent = new McMMOPlayerRepairCheckEvent(player, (short) (initialDurability - newDurability), repairMaterial, item);
-        Bukkit.getPluginManager().callEvent(preEvent);
+        McMMOPlayerRepairCheckEvent event = new McMMOPlayerRepairCheckEvent(player, (short) (initialDurability - newDurability), repairMaterial, item);
+        Bukkit.getPluginManager().callEvent(event);
 
-        if (preEvent.isCancelled()) {
+        if (event.isCancelled()) {
             return;
         }
 

+ 1 - 1
src/main/resources/locale/locale_en_us.properties

@@ -431,7 +431,7 @@ Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
 m.EffectsTaming7_1=Summon an animal to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones/Fish in hand
 m.EffectsTaming1_1=Bone-whacking inspects wolves/ocelots
-m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]]
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
 Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
 Inspect.DoesNotExist = [[RED]]Player does not exist in the database!