From fae55c1edf2beaf29341d2d94a3c033c3c2a3ad0 Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Mon, 8 Dec 2025 21:34:09 +0100
Subject: [PATCH 1/2] Fix self damage awarding skill xp (#5233)

---
 src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 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
index 0f3591f19..7eb32d0d7 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -935,7 +935,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()

From 5c283fedb36a4a8d12c3ca100d8cc7c3d7b7d042 Mon Sep 17 00:00:00 2001
From: Nadie <Hackerjef@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:34:53 -0500
Subject: [PATCH 2/2] Change Protocollib's repo to use new namespace & group id
 (#5232)

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 009228855..7fb62026e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,11 +236,6 @@
     </pluginRepositories>
 
     <repositories>
-        <!-- Protocol Lib Repository -->
-        <repository>
-            <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/repository/public/</url>
-        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -292,7 +287,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.comphenix.protocol</groupId>
+            <groupId>net.dmulloy2</groupId>
             <artifactId>ProtocolLib</artifactId>
             <version>5.3.0</version>
             <scope>compile</scope>