EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-19 05:44:44 +02:00
Code Issues Projects Releases Wiki Activity

Move Roll checks into the manager.

Browse Source
This commit is contained in:
GJ
2013-02-26 08:19:21 -05:00
parent d46b134dbb
commit d409610a55
5 changed files with 49 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java
View File

@ -54,42 +54,6 @@ public final class Acrobatics {
return false;
}
public static int processRoll(Player player, int damage) {
if (player.isSneaking() && Permissions.gracefulRoll(player)) {
return processGracefulRoll(player, damage);
}
int modifiedDamage = calculateModifiedRollDamage(damage, rollThreshold);
if (!isFatal(player, modifiedDamage) && isSuccessfulRoll(player, rollMaxChance, rollMaxBonusLevel, 1)) {
player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Text"));
applyXpGain(player, damage, rollXpModifier);
return modifiedDamage;
}
else if (!isFatal(player, damage)) {
applyXpGain(player, damage, fallXpModifier);
}
return damage;
}
private static int processGracefulRoll(Player player, int damage) {
int modifiedDamage = calculateModifiedRollDamage(damage, gracefulRollThreshold);
if (!isFatal(player, modifiedDamage) && isSuccessfulRoll(player, gracefulRollMaxChance, gracefulRollMaxBonusLevel, gracefulRollSuccessModifier)) {
player.sendMessage(LocaleLoader.getString("Acrobatics.Ability.Proc"));
applyXpGain(player, damage, rollXpModifier);
return modifiedDamage;
}
else if (!isFatal(player, damage)) {
applyXpGain(player, damage, fallXpModifier);
}
return damage;
}
protected static boolean isFatal(Player player, int damage) {
return player.getHealth() - damage < 1;
}