EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-17 01:23:39 +02:00
Code Issues Projects Releases Wiki Activity

More work on commands.

Browse Source
This commit is contained in:
GJ 2012-04-03 16:13:16 -04:00
parent 069e656cde
commit eb7a0143da
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/commands/general/InspectCommand.java
View File

@ -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;

6
src/main/java/com/gmail/nossr50/skills/Repair.java
View File

@ -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;
}

2
src/main/resources/locale/locale_en_us.properties
View File

@ -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!