EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-21 20:56:45 +01:00
Code Issues Projects Releases Wiki Activity

CombatUtils: Don't run checks against party features if parties are disabled (#5005)

Browse Source 
Co-authored-by: Dieu <info@l4b.org>
This commit is contained in:
IAISI 2024-05-12 00:07:01 +02:00 committed by GitHub
parent fb0c8ec934
commit df6ddd6faa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,8 +968,10 @@ public final class CombatUtils {
return false;
}
if ((mcMMO.p.getPartyManager().inSameParty(player, defender) || mcMMO.p.getPartyManager().areAllies(player, defender)) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) {
return false;
if(mcMMO.p.getPartyConfig().isPartyEnabled()) {
if ((mcMMO.p.getPartyManager().inSameParty(player, defender) || mcMMO.p.getPartyManager().areAllies(player, defender)) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) {
return false;
}
}
// Vanished players should not be able to get hit by AoE effects
@ -1019,7 +1021,7 @@ public final class CombatUtils {
if (tamer instanceof Player owner) {
return (owner == attacker || mcMMO.p.getPartyManager().inSameParty(attacker, owner) || mcMMO.p.getPartyManager().areAllies(attacker, owner));
return (owner == attacker || (mcMMO.p.getPartyConfig().isPartyEnabled() && (mcMMO.p.getPartyManager().inSameParty(attacker, owner) || mcMMO.p.getPartyManager().areAllies(attacker, owner))));
}
}