From 45fbb47ccf75b05cacaeb1c4ce56364407987853 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 18 Feb 2013 15:28:18 -0800 Subject: [PATCH] Moving this check up --- .../gmail/nossr50/database/commands/MmoupdateCommand.java | 2 +- .../java/com/gmail/nossr50/datatypes/McMMOPlayer.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java index fbe5d1abe..5bf0be742 100644 --- a/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java +++ b/src/main/java/com/gmail/nossr50/database/commands/MmoupdateCommand.java @@ -42,4 +42,4 @@ public class MmoupdateCommand implements CommandExecutor { mcMMO.p.getServer().getScheduler().runTaskLaterAsynchronously(mcMMO.p, new SQLConversionTask(), 1); } -} +} \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java index 72b67f84f..ebfba2603 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java @@ -65,6 +65,10 @@ public class McMMOPlayer { * @param xp Experience amount to process */ public void beginXpGain(SkillType skillType, int xp) { + if (xp == 0) { + return; + } + // Return if the experience has been shared if (party != null && ShareHandler.handleXpShare(xp, this, skillType)) { return; @@ -82,10 +86,6 @@ public class McMMOPlayer { public void beginUnsharedXpGain(SkillType skillType, int xp) { xp = modifyXpGain(skillType, xp); - if (xp == 0) { - return; - } - applyXpGain(skillType, xp); }