mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-28 03:34:43 +02:00
Made xp sharing less ugly by reworking McMMOPlayer xp methods
Notable consequence: checkXP and addLevel in ExperienceAPI are no longer needed and became deprecated
This commit is contained in:
@ -46,7 +46,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {
|
||||
McMMOPlayer mcMMOPlayer = manager.getMcMMOPlayer();
|
||||
|
||||
if (System.currentTimeMillis() >= mcMMOPlayer.getProfile().getRespawnATS() + Misc.PLAYER_RESPAWN_COOLDOWN_SECONDS) {
|
||||
manager.getMcMMOPlayer().addXp(SkillType.ACROBATICS, xp);
|
||||
manager.getMcMMOPlayer().beginXpGain(SkillType.ACROBATICS, xp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
|
||||
|
||||
@Override
|
||||
protected void processXpGain(int xp) {
|
||||
manager.getMcMMOPlayer().addXp(SkillType.ACROBATICS, xp);
|
||||
manager.getMcMMOPlayer().beginXpGain(SkillType.ACROBATICS, xp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -34,7 +34,7 @@ public class ArcheryManager extends SkillManager {
|
||||
}
|
||||
|
||||
int bonusXp = (int) (squaredDistance * Archery.distanceXpModifer);
|
||||
mcMMOPlayer.addXp(SkillType.ARCHERY, bonusXp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.ARCHERY, bonusXp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -119,7 +119,7 @@ public class Excavation {
|
||||
}
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.EXCAVATION, xp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.EXCAVATION, xp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -128,7 +128,7 @@ public final class Fishing {
|
||||
caught.setItemStack(treasureDrop);
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.FISHING, Config.getInstance().getFishingBaseXP() + treasureXp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.FISHING, Config.getInstance().getFishingBaseXP() + treasureXp);
|
||||
event.setExpToDrop(event.getExpToDrop() * getVanillaXpMultiplier(skillLevel));
|
||||
}
|
||||
|
||||
|
@ -212,7 +212,7 @@ public class Herbalism {
|
||||
}
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.HERBALISM, xp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.HERBALISM, xp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -104,7 +104,7 @@ public class Mining {
|
||||
break;
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.MINING, xp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.MINING, xp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -48,7 +48,7 @@ public class Repair {
|
||||
Player player = mcMMOPlayer.getPlayer();
|
||||
|
||||
player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
|
||||
mcMMOPlayer.addXp(SkillType.REPAIR, dif * 10);
|
||||
mcMMOPlayer.beginXpGain(SkillType.REPAIR, dif * 10);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -35,6 +35,6 @@ public class CombatXpGiver implements Runnable {
|
||||
damage += health;
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(skillType, (int) (damage * baseXp));
|
||||
mcMMOPlayer.beginXpGain(skillType, (int) (damage * baseXp));
|
||||
}
|
||||
}
|
||||
|
@ -68,11 +68,11 @@ public class SmeltResourceEventHandler {
|
||||
Player player = mcMMOPlayer.getPlayer();
|
||||
|
||||
if (Permissions.mining(player)) {
|
||||
mcMMOPlayer.addXp(SkillType.MINING, xp / 2);
|
||||
mcMMOPlayer.beginXpGain(SkillType.MINING, xp / 2);
|
||||
}
|
||||
|
||||
if (Permissions.repair(player)) {
|
||||
mcMMOPlayer.addXp(SkillType.REPAIR, xp / 2);
|
||||
mcMMOPlayer.beginXpGain(SkillType.REPAIR, xp / 2);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -33,11 +33,11 @@ public class TamingManager extends SkillManager {
|
||||
|
||||
switch (event.getEntityType()) {
|
||||
case WOLF:
|
||||
mcMMOPlayer.addXp(SkillType.TAMING, Taming.wolfXp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.TAMING, Taming.wolfXp);
|
||||
break;
|
||||
|
||||
case OCELOT:
|
||||
mcMMOPlayer.addXp(SkillType.TAMING, Taming.ocelotXp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.TAMING, Taming.ocelotXp);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -220,6 +220,6 @@ public final class TreeFeller {
|
||||
block.setType(Material.AIR);
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.WOODCUTTING, xp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.WOODCUTTING, xp);
|
||||
}
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ public final class Woodcutting {
|
||||
checkForDoubleDrop(mcMMOPlayer, block);
|
||||
}
|
||||
|
||||
mcMMOPlayer.addXp(SkillType.WOODCUTTING, xp);
|
||||
mcMMOPlayer.beginXpGain(SkillType.WOODCUTTING, xp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user