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

Change XP processing to use a single function.

Browse Source
This commit is contained in:
GJ
2012-06-04 09:30:51 -04:00
parent 2a27048174
commit 1e58c32a5f
12 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java
View File

@ -107,9 +107,7 @@ public class Excavation {
}
}
//Handle XP related tasks
PP.addXP(player, SkillType.EXCAVATION, xp);
Skills.xpCheckSkill(SkillType.EXCAVATION, player);
Skills.xpProcessing(player, PP, SkillType.EXCAVATION, xp);
}
/**

3
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -117,8 +117,7 @@ public class Fishing {
theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); //Change durability to random value
}
PP.addXP(player, SkillType.FISHING, Config.getInstance().getFishingBaseXP());
Skills.xpCheckSkill(SkillType.FISHING, player);
Skills.xpProcessing(player, PP, SkillType.FISHING, Config.getInstance().getFishingBaseXP());
}
/**

3
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
View File

@ -288,8 +288,7 @@ public class Herbalism {
}
}
PP.addXP(player, SkillType.HERBALISM, xp);
Skills.xpCheckSkill(SkillType.HERBALISM, player);
Skills.xpProcessing(player, PP, SkillType.HERBALISM, xp);
}
/**

3
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -275,8 +275,7 @@ public class Mining {
break;
}
PP.addXP(player, SkillType.MINING, xp);
Skills.xpCheckSkill(SkillType.MINING, player);
Skills.xpProcessing(player, PP, SkillType.MINING, xp);
}
/**

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

@ -203,8 +203,7 @@ public class WoodCutting {
}
if (Permissions.getInstance().woodcutting(player)) {
PP.addXP(player, SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
Skills.xpCheckSkill(SkillType.WOODCUTTING, player);
Skills.xpProcessing(player, PP, SkillType.WOODCUTTING, xp);
}
}
@ -384,8 +383,7 @@ public class WoodCutting {
}
WoodCutting.woodCuttingProcCheck(player, block);
PP.addXP(player, SkillType.WOODCUTTING, xp);
Skills.xpCheckSkill(SkillType.WOODCUTTING, player);
Skills.xpProcessing(player, PP, SkillType.WOODCUTTING, xp);
}
/**

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

@ -58,8 +58,7 @@ public class Acrobatics {
/* Check for death */
if (health - damage >= 1) {
PP.addXP(player, SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
Skills.xpCheckSkill(SkillType.ACROBATICS, player);
Skills.xpProcessing(player, PP, SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
event.setDamage(newDamage);
@ -76,8 +75,7 @@ public class Acrobatics {
}
}
else if (health - damage >= 1) {
PP.addXP(player, SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
Skills.xpCheckSkill(SkillType.ACROBATICS, player);
Skills.xpProcessing(player, PP, SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
}
}
@ -111,8 +109,7 @@ public class Acrobatics {
defender.sendMessage(LocaleLoader.getString("Acrobatics.Combat.Proc"));
if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
PPd.addXP(defender, SkillType.ACROBATICS, damage * DODGE_MODIFIER);
Skills.xpCheckSkill(SkillType.ACROBATICS, defender);
Skills.xpProcessing(defender, PPd, SkillType.ACROBATICS, damage * DODGE_MODIFIER);
}
int newDamage = damage / 2;

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

@ -42,8 +42,7 @@ public class Repair {
dif = (short) (dif * modify);
PP.addXP(player, SkillType.REPAIR, dif * 10);
Skills.xpCheckSkill(SkillType.REPAIR, player);
Skills.xpProcessing(player, PP, SkillType.REPAIR, dif * 10);
//CLANG CLANG
if (mcMMO.p.spoutEnabled) {