Browse Source

XP Bars will no longer update for party xp or vampirism xp

nossr50 6 years ago
parent
commit
8c5ea484eb

+ 3 - 2
src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -142,9 +142,10 @@ public class McMMOPlayer {
         experienceBarManager.hideExperienceBar(primarySkillType);
     }*/
 
-    public void processPostXpEvent(PrimarySkillType primarySkillType, mcMMO plugin)
+    public void processPostXpEvent(XPGainReason xpGainReason, PrimarySkillType primarySkillType, mcMMO plugin)
     {
-        updateXPBar(primarySkillType, plugin);
+        if(xpGainReason != XPGainReason.SHARED_PVP && xpGainReason != XPGainReason.SHARED_PVE && xpGainReason != XPGainReason.VAMPIRISM)
+            updateXPBar(primarySkillType, plugin);
     }
 
     public void updateXPBar(PrimarySkillType primarySkillType, mcMMO plugin)

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

@@ -63,7 +63,7 @@ public class SelfListener implements Listener {
         if (event.getXpGainReason() == XPGainReason.COMMAND)
         {
             //Update the XP Bar
-            mcMMOPlayer.processPostXpEvent(primarySkillType, plugin);
+            mcMMOPlayer.processPostXpEvent(event.getXpGainReason(), primarySkillType, plugin);
             return;
         }
 
@@ -72,7 +72,7 @@ public class SelfListener implements Listener {
         if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
             // Diminished returns is turned off
             //Update the XP Bar
-            mcMMOPlayer.processPostXpEvent(primarySkillType, plugin);
+            mcMMOPlayer.processPostXpEvent(event.getXpGainReason(), primarySkillType, plugin);
             return;
         }
 
@@ -118,6 +118,6 @@ public class SelfListener implements Listener {
 
         //Update the XP Bar
         if(!event.isCancelled())
-            mcMMOPlayer.processPostXpEvent(primarySkillType, plugin);
+            mcMMOPlayer.processPostXpEvent(event.getXpGainReason(), primarySkillType, plugin);
     }
 }