Check if Parties are enabled before running inSameParty in CombatUtil…

…s#processCombatXP
mcMMO-Dev · Feb 22, 2024 · 91fb799 · 91fb799
1 parent 1c1781c
commit 91fb799
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -741,7 +741,8 @@ public static void processCombatXP(@NotNull McMMOPlayer mcMMOPlayer,
         XPGainReason xpGainReason;
 
         if (target instanceof Player defender) {
-            if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled() || mcMMO.p.getPartyManager().inSameParty(mcMMOPlayer.getPlayer(), (Player) target)) {
+            if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled() ||
+                    (mcMMO.p.getPartyConfig().isPartyEnabled() && mcMMO.p.getPartyManager().inSameParty(mcMMOPlayer.getPlayer(), (Player) target))) {
                 return;
             }