Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO into spears

This commit is contained in:
nossr50
2025-12-08 12:35:10 -08:00
2 changed files with 3 additions and 7 deletions

View File

@@ -981,7 +981,8 @@ public final class CombatUtils {
XPGainReason xpGainReason;
if (target instanceof Player defender) {
if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled()
if (defender.equals(mmoPlayer.getPlayer())
|| !ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled()
||
(mcMMO.p.getPartyConfig().isPartyEnabled()
&& mcMMO.p.getPartyManager()