From f5290c3256799143db0b6e94213a79b92e121692 Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 26 Feb 2013 08:22:08 -0500 Subject: [PATCH] Name 'em all the same. --- .../java/com/gmail/nossr50/listeners/EntityListener.java | 2 +- .../gmail/nossr50/skills/acrobatics/AcrobaticsManager.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index f3cfda655..ec872a03b 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -180,7 +180,7 @@ public class EntityListener implements Listener { switch (cause) { case FALL: if (Acrobatics.canRoll(player)) { - event.setDamage(SkillManagerStore.getInstance().getAcrobaticsManager(player.getName()).processRoll(event.getDamage())); + event.setDamage(SkillManagerStore.getInstance().getAcrobaticsManager(player.getName()).rollCheck(event.getDamage())); if (event.getDamage() == 0) { event.setCancelled(true); diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index d8d3b058d..7afe50e6d 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -53,11 +53,11 @@ public class AcrobaticsManager extends SkillManager { * @param damage The amount of damage initially dealt by the event * @return the modified event damage if the roll was successful, the original event damage otherwise */ - public int processRoll(int damage) { + public int rollCheck(int damage) { Player player = getPlayer(); if (player.isSneaking() && Permissions.gracefulRoll(player)) { - return processGracefulRoll(player, damage); + return gracefulRollCheck(player, damage); } int modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.rollThreshold); @@ -75,7 +75,7 @@ public class AcrobaticsManager extends SkillManager { return damage; } - private int processGracefulRoll(Player player, int damage) { + private int gracefulRollCheck(Player player, int damage) { int modifiedDamage = Acrobatics.calculateModifiedRollDamage(damage, Acrobatics.gracefulRollThreshold); if (!Acrobatics.isFatal(player, modifiedDamage) && Acrobatics.isSuccessfulRoll(player, Acrobatics.gracefulRollMaxChance, Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollSuccessModifier)) {