From 0c4c85f3b6ff5931cc4cef9ec317f4403e4a82b6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 12 Jun 2022 12:08:06 +0000
Subject: [PATCH] Use of AltCommandChannelFriends configuration at Player
 isAutoAttackable method. Contributed by Enryu.

---
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 .../java/org/l2jmobius/gameserver/model/actor/Player.java   | 6 ++++++
 23 files changed, 138 insertions(+)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
index e3ed4dbbf2..03cc97bd8c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8261,6 +8261,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
index 2fc3956fce..f66fe41530 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8264,6 +8264,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
index 12bdbe8051..a57371c3e3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8266,6 +8266,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
index 9bd211efc1..834dd8b7cb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8261,6 +8261,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
index 41889c97ff..491563e459 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8278,6 +8278,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
index a42b44a310..05d7db375a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8278,6 +8278,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1908f1c696..e1eb9e5c0e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8279,6 +8279,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index 8c2c9ae51b..3525816d88 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8294,6 +8294,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index 75e56e798d..cf7901831a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8396,6 +8396,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 7dde9598c5..1ec7a06952 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8422,6 +8422,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 65e7b71114..e6fc06a4e9 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8459,6 +8459,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 72fe029dd8..02f5fd131e 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8487,6 +8487,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
index b2227aef32..587bf5ca63 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8171,6 +8171,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6a27280f63..597279cedb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8171,6 +8171,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
index 53bd845911..5da72ca7c0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8157,6 +8157,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
index c10fa0e657..9da74fd599 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8184,6 +8184,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
index f5116feec8..1def4201f6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8184,6 +8184,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index 56f4e3c73a..b9789fe3e8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8138,6 +8138,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6ff3158fdc..455b315d83 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8149,6 +8149,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 7b90fbac81..6c2ae2d705 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8290,6 +8290,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index 76443bc9c3..8af2f22629 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8357,6 +8357,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index 01d87ca205..09d1e13d01 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8537,6 +8537,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
index 4fd7e2d94e..5762a6d3dc 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -8574,6 +8574,12 @@ public class Player extends Playable
 				return false;
 			}
 			
+			// Same Command Channel are friends.
+			if (Config.ALT_COMMAND_CHANNEL_FRIENDS && (isInParty() && (getParty().getCommandChannel() != null) && attacker.isInParty() && (attacker.getParty().getCommandChannel() != null) && (getParty().getCommandChannel() == attacker.getParty().getCommandChannel())))
+			{
+				return false;
+			}
+			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();