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

Put McMMOPlayer to use where it made sense

Browse Source 
It's basically a wrapper for anything related to players, as a
consequence Users.getProfile() is now depreciated.
Also removed SkillTools.xpProcessing() because of some redundancy with
McMMOPlayer.addXp().
+ some cleanup for consistency sake.
This commit is contained in:
bm01
2013-02-01 06:38:25 +01:00
parent d0c0b9a089
commit 7d83dd8283
56 changed files with 487 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/skills/runnables/GainXp.java → src/main/java/com/gmail/nossr50/skills/runnables/CombatXpGiver.java
View File

@@ -1,23 +1,19 @@
package com.gmail.nossr50.skills.runnables;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.skills.utilities.SkillTools;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.skills.utilities.SkillType;
public class GainXp implements Runnable {
private Player player;
private PlayerProfile profile;
public class CombatXpGiver implements Runnable {
private McMMOPlayer mcMMOPlayer;
private double baseXp;
private SkillType skillType;
private LivingEntity target;
private int baseHealth;
public GainXp(Player player, PlayerProfile profile, SkillType skillType, double baseXp, LivingEntity target) {
this.player = player;
this.profile = profile;
public CombatXpGiver(McMMOPlayer mcMMOPlayer, SkillType skillType, double baseXp, LivingEntity target) {
this.mcMMOPlayer = mcMMOPlayer;
this.skillType = skillType;
this.baseXp = baseXp;
this.target = target;
@@ -39,6 +35,6 @@ public class GainXp implements Runnable {
damage += health;
}
SkillTools.xpProcessing(player, profile, skillType, (int) (damage * baseXp));
mcMMOPlayer.addXp(skillType, (int) (damage * baseXp));
}
}