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

pom.xml

@@ -241,11 +241,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>
@@ -297,7 +292,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>

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -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()