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

Refixed NPE due to GainXp task

Browse Source
This commit is contained in:
bm01
2012-05-06 09:47:25 +02:00
parent 1b37ba8daa
commit 3e435c419a
11 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ public class Excavation {
}
//Handle XP related tasks
PP.addXP(SkillType.EXCAVATION, xp);
PP.addXP(player, SkillType.EXCAVATION, xp);
Skills.XpCheckSkill(SkillType.EXCAVATION, player);
}

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

@ -103,7 +103,7 @@ public class Fishing {
FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
if (random.nextDouble() * 100 <= treasure.getDropChance()) {
Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
Users.getProfile(player).addXP(player, SkillType.FISHING, treasure.getXp());
theCatch.setItemStack(treasure.getDrop());
}
}
@ -117,7 +117,7 @@ public class Fishing {
theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); //Change durability to random value
}
PP.addXP(SkillType.FISHING, Config.getInstance().getFishingBaseXP());
PP.addXP(player, SkillType.FISHING, Config.getInstance().getFishingBaseXP());
Skills.XpCheckSkill(SkillType.FISHING, player);
}

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

@ -269,7 +269,7 @@ public class Herbalism {
}
}
PP.addXP(SkillType.HERBALISM, xp);
PP.addXP(player, SkillType.HERBALISM, xp);
Skills.XpCheckSkill(SkillType.HERBALISM, player);
}

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

@ -201,7 +201,7 @@ public class Mining {
break;
}
PP.addXP(SkillType.MINING, xp);
PP.addXP(player, SkillType.MINING, xp);
Skills.XpCheckSkill(SkillType.MINING, player);
}

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

@ -160,7 +160,7 @@ public class WoodCutting {
}
if (Permissions.getInstance().woodcutting(player)) {
PP.addXP(SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
PP.addXP(player, SkillType.WOODCUTTING, xp); //Tree Feller gives nerf'd XP
Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
}
}
@ -322,7 +322,7 @@ public class WoodCutting {
}
WoodCutting.woodCuttingProcCheck(player, block);
PP.addXP(SkillType.WOODCUTTING, xp);
PP.addXP(player, SkillType.WOODCUTTING, xp);
Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
}

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

@ -59,7 +59,7 @@ public class Acrobatics {
/* Check for death */
if (health - damage >= 1) {
PP.addXP(SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
PP.addXP(player, SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER);
Skills.XpCheckSkill(SkillType.ACROBATICS, player);
event.setDamage(newDamage);
@ -77,7 +77,7 @@ public class Acrobatics {
}
}
else if (health - damage >= 1) {
PP.addXP(SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
PP.addXP(player, SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER);
Skills.XpCheckSkill(SkillType.ACROBATICS, player);
}
}
@ -112,7 +112,7 @@ public class Acrobatics {
defender.sendMessage(LocaleLoader.getString("Acrobatics.Combat.Proc"));
if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER);
PPd.addXP(defender, SkillType.ACROBATICS, damage * DODGE_MODIFIER);
Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
}

2
src/main/java/com/gmail/nossr50/skills/misc/Repair.java
View File

@ -139,7 +139,7 @@ public class Repair {
dif = (short) (dif / 2);
}
PP.addXP(SkillType.REPAIR, dif * 10);
PP.addXP(player, SkillType.REPAIR, dif * 10);
Skills.XpCheckSkill(SkillType.REPAIR, player);
//CLANG CLANG