From f7eb06e80b552fb3dcd2f0690e7a43dd7611691c Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 27 Apr 2019 06:39:06 -0700
Subject: [PATCH] 2.1.50

---
 Changelog.txt                                 |  8 +++++
 pom.xml                                       |  2 +-
 .../gmail/nossr50/listeners/SelfListener.java | 33 +++++++++----------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index a3be83604..9b352203b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,9 +1,17 @@
 Version 2.1.50
+    Fixed a bug where early game XP boost (level 1-5) didn't function in certain circumstances
     Updated German locale (thanks OverCrave)
     Added missing Herbalism XP values for: Bamboo, Cornflower, Lily of the valley, Wither rose (thanks Zed-I)
     Added missing Mining XP values for: Stone Bricks, Cracked Stone Bricks, Mossy Stone Bricks, Chiseled Stone Bricks, Prismarine Bricks, Dark Prismarine, Sea Lantern (thanks Zed-I)
     Added missing Combat XP multiplier for: Wandering Trader (thanks Zed-I)
 
+    Notes:
+    If you haven't upgraded mcMMO since version 2.1.47 or before you will not need to do these steps as the experience file will update once automatically.
+    You can either delete experience.yml to generate a new one or edit it manually
+    This is what the default experience.yml looks like
+    https://paste.gg/p/anonymous/946f62ce7dff4ab7a87cae70c0266313
+
+
 Version 2.1.49
     Added sweet berry bush to Herbalism XP (Update your experience.yml config or delete it to gen a new one)
     Fixed a bug where falling blocks were not marked as unnatural in water
diff --git a/pom.xml b/pom.xml
index bf265d9b4..bcf4dd2ec 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.50-SNAPSHOT</version>
+    <version>2.1.50</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
index 8c995bd48..79f45bde5 100644
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -95,23 +95,6 @@ public class SelfListener implements Listener {
             return;
         }
 
-        int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType);
-
-        if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
-            // Diminished returns is turned off
-            return;
-        }
-
-
-        if (event.getRawXpGained() <= 0) {
-            // Don't calculate for XP subtraction
-            return;
-        }
-
-        if (primarySkillType.isChildSkill()) {
-            return;
-        }
-
         int earlyLevelBonusXPCap = mcMMO.isRetroModeEnabled() ? 50 : 5;
 
         int earlyGameBonusXP = 0;
@@ -123,6 +106,22 @@ public class SelfListener implements Listener {
             event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP);
         }
 
+        int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType);
+
+        if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
+            // Diminished returns is turned off
+            return;
+        }
+
+        if (event.getRawXpGained() <= 0) {
+            // Don't calculate for XP subtraction
+            return;
+        }
+
+        if (primarySkillType.isChildSkill()) {
+            return;
+        }
+
         final float rawXp = event.getRawXpGained();
 
         float guaranteedMinimum = ExperienceConfig.getInstance().getDiminishedReturnsCap() * rawXp;