Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Avoid a few unnecessary calls.

Browse Source
This commit is contained in:
GJ 2013-01-21 19:36:15 -05:00
parent 7f8beca33c
commit 67fd45ef25
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/unarmed/DisarmEventHandler.java
View File

@ -19,8 +19,6 @@ public class DisarmEventHandler {
this.manager = manager; this.manager = manager;
this.defender = defender; this.defender = defender;
this.inHand = defender.getItemInHand(); this.inHand = defender.getItemInHand();
calculateSkillModifier();
} }
protected boolean isHoldingItem() { protected boolean isHoldingItem() {
@ -31,7 +29,7 @@ public class DisarmEventHandler {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.DISARM_MAX_BONUS_LEVEL); this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.DISARM_MAX_BONUS_LEVEL);
} }
protected void sendAbilityMessage() { private void sendAbilityMessage() {
defender.sendMessage(LocaleLoader.getString("Skills.Disarmed")); defender.sendMessage(LocaleLoader.getString("Skills.Disarmed"));
} }

5
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -19,10 +19,7 @@ public class UnarmedManager extends SkillManager {
* @param defender The defending player * @param defender The defending player
*/ */
public void disarmCheck(Player defender) { public void disarmCheck(Player defender) {
if (player == null) if (Misc.isNPC(player) || !Permissions.disarm(player)) {
return;
if (!Permissions.disarm(player)) {
return; return;
} }