You can now enable Party Friendly Fire

Changelog.txt

@@ -79,6 +79,7 @@ Version 2.1.0
  = (MySQL) When converting from MySQL to flatfile mcMMO will now properly include all users in the conversion process
  = (Commands) '/mcMMO help' no longer displays the other/special commands category to players lacking permissions
  + (Party) Parties can now have size limits (configurable in config.yml), party size is unlimited by default
+ + (Party) You can now turn on Friendly Fire for parties in config.yml
  ! (Deaths) Fixed the bug where mob names would be replaced by hearts
  ! (Experience) The XP values of fish are now based on their rarity and have been drastically changed
  ! (Experience) Skills now start at level 1 (configurable in advanced.yml)

src/main/java/com/gmail/nossr50/config/Config.java

@@ -409,6 +409,7 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }
 
     /* PARTY SETTINGS */
+    public boolean getPartyFriendlyFire() { return config.getBoolean("Party.FriendlyFire", false);}
     public int getPartyMaxSize() {return config.getInt("Party.MaxSize", -1); }
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
     public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.meta.OldName;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -150,10 +151,12 @@ public class EntityListener implements Listener {
                 Player defendingPlayer = (Player) defender;
                 Player attackingPlayer = (Player) attacker;
                 if (event.getDamage(DamageModifier.ABSORPTION) > 0) {
-                    if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
+                    //If friendly fire is off don't allow players to hurt one another
-                        event.setCancelled(true);
+                    if(!Config.getInstance().getPartyFriendlyFire())
-                        return;
+                        if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
-                    }
+                            event.setCancelled(true);
+                            return;
+                        }
                 }
             }
             return;
@@ -219,10 +222,12 @@ public class EntityListener implements Listener {
                 return;
             }
 
-            if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
+            //Party Friendly Fire
-                event.setCancelled(true);
+            if(!Config.getInstance().getPartyFriendlyFire())
-                return;
+                if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
-            }
+                    event.setCancelled(true);
+                    return;
+                }
         }
 
         CombatUtils.processCombatAttack(event, attacker, target);

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

@@ -453,7 +453,7 @@ public final class CombatUtils {
         XPGainReason xpGainReason;
 
         if (target instanceof Player) {
-            if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled()) {
+            if (!ExperienceConfig.getInstance().getExperienceGainsPlayerVersusPlayerEnabled() || PartyManager.inSameParty(mcMMOPlayer.getPlayer(), (Player) target)) {
                 return;
             }
 

src/main/resources/config.yml

@@ -237,6 +237,8 @@ Items:
 #  Settings for Parties
 ###
 Party:
+    # Enable Hurting other players in the same party
+    FriendlyFire: false
     # Maximum size for a party, -1 for infinite
     MaxSize: -1
     # Amount of time (in hours) to wait between automatically kicking old party members