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

Cleaned out more traces of old event system.

Browse Source
This commit is contained in:
GJ
2012-03-03 14:13:33 -05:00
parent ccfce843be
commit 0dd9bc1cda
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class Acrobatics {
if(player.isSneaking())
acrovar = acrovar * 2;
if(Math.random() * 1000 <= acrovar && !event.isCancelled())
if(Math.random() * 1000 <= acrovar)
{
int threshold = 7;
@ -51,9 +51,9 @@ public class Acrobatics {
/*
* Check for death
*/
if(player.getHealth() - newDamage >= 1){
if(!event.isCancelled())
PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
if(player.getHealth() - newDamage >= 1)
{
PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
Skills.XpCheckSkill(SkillType.ACROBATICS, player);
event.setDamage(newDamage);
if(event.getDamage() <= 0)
@ -64,11 +64,11 @@ public class Acrobatics {
player.sendMessage("**ROLL**");
}
}
} else if (!event.isCancelled()){
if(player.getHealth() - event.getDamage() >= 1){
PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
Skills.XpCheckSkill(SkillType.ACROBATICS, player);
}
}
else if(player.getHealth() - event.getDamage() >= 1)
{
PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
Skills.XpCheckSkill(SkillType.ACROBATICS, player);
}
}
public static void dodgeChecks(EntityDamageByEntityEvent event){