nossr50 %!s(int64=6) %!d(string=hai) anos
pai
achega
f7eb06e80b
Modificáronse 3 ficheiros con 20 adicións e 13 borrados
  1. 8 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 11 12
      src/main/java/com/gmail/nossr50/listeners/SelfListener.java

+ 8 - 0
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

+ 1 - 1
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>

+ 11 - 12
src/main/java/com/gmail/nossr50/listeners/SelfListener.java

@@ -95,6 +95,17 @@ public class SelfListener implements Listener {
             return;
         }
 
+        int earlyLevelBonusXPCap = mcMMO.isRetroModeEnabled() ? 50 : 5;
+
+        int earlyGameBonusXP = 0;
+
+        //Give some bonus XP for low levels
+        if(mcMMOPlayer.getSkillLevel(primarySkillType) < earlyLevelBonusXPCap)
+        {
+            earlyGameBonusXP += (mcMMOPlayer.getXpToLevel(primarySkillType) * 0.05);
+            event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP);
+        }
+
         int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType);
 
         if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
@@ -102,7 +113,6 @@ public class SelfListener implements Listener {
             return;
         }
 
-
         if (event.getRawXpGained() <= 0) {
             // Don't calculate for XP subtraction
             return;
@@ -112,17 +122,6 @@ public class SelfListener implements Listener {
             return;
         }
 
-        int earlyLevelBonusXPCap = mcMMO.isRetroModeEnabled() ? 50 : 5;
-
-        int earlyGameBonusXP = 0;
-
-        //Give some bonus XP for low levels
-        if(mcMMOPlayer.getSkillLevel(primarySkillType) < earlyLevelBonusXPCap)
-        {
-            earlyGameBonusXP += (mcMMOPlayer.getXpToLevel(primarySkillType) * 0.05);
-            event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP);
-        }
-
         final float rawXp = event.getRawXpGained();
 
         float guaranteedMinimum = ExperienceConfig.getInstance().getDiminishedReturnsCap() * rawXp;