EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-17 06:18:46 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nossr50
2025-12-08 12:35:10 -08:00
parent 4052e7e546 5c283fedb3
commit 505352ac70
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -241,11 +241,6 @@
</pluginRepositories> </pluginRepositories>
<repositories> <repositories>
<!-- Protocol Lib Repository -->
<repository>
<id>dmulloy2-repo</id>
<url>https://repo.dmulloy2.net/repository/public/</url>
</repository>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -297,7 +292,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>net.dmulloy2</groupId>
<artifactId>ProtocolLib</artifactId> <artifactId>ProtocolLib</artifactId>
<version>5.3.0</version> <version>5.3.0</version>
<scope>compile</scope> <scope>compile</scope>

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

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