Addition of Player isAutoAttackable siege check for same clan.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8245,7 +8245,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8264,9 +8266,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8307,13 +8310,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8248,7 +8248,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8267,9 +8269,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8310,13 +8313,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8250,7 +8250,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8269,9 +8271,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8312,13 +8315,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8268,7 +8268,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8287,9 +8289,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8330,13 +8333,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8285,7 +8285,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8304,9 +8306,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8347,13 +8350,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8298,7 +8298,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8317,9 +8319,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8360,13 +8363,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8299,7 +8299,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8318,9 +8320,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8361,13 +8364,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8327,7 +8327,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8346,9 +8348,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8389,13 +8392,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8437,7 +8437,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8456,9 +8458,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8499,13 +8502,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8463,7 +8463,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8482,9 +8484,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8525,13 +8528,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8522,7 +8522,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8541,9 +8543,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8584,13 +8587,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8552,7 +8552,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8571,9 +8573,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8614,13 +8617,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -7989,28 +7989,33 @@ public class Player extends Playable
 			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
-			if (_clan != null)
+			final Clan clan = getClan();
+			final Clan attackerClan = attackerPlayer.getClan();
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
 					{
 						// Check if a siege is in progress and if attacker and the Player aren't in the Defender clan.
-					if (siege.checkIsDefender(attackerPlayer.getClan()) && siege.checkIsDefender(getClan()))
+						if (siege.checkIsDefender(attackerClan) && siege.checkIsDefender(clan))
 						{
 							return false;
 						}
 						
 						// Check if a siege is in progress and if attacker and the Player aren't in the Attacker clan.
-					if (siege.checkIsAttacker(attackerPlayer.getClan()) && siege.checkIsAttacker(getClan()))
+						if (siege.checkIsAttacker(attackerClan) && siege.checkIsAttacker(clan))
 						{
 							// If first mid victory is achieved, attackers can attack attackers.
 							final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((getClan() != null) && (attackerPlayer.getClan() != null) && getClan().isAtWarWith(attackerPlayer.getClanId()) && attackerPlayer.getClan().isAtWarWith(getClanId()) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember() && clan.isAtWarWith(attackerPlayer.getClanId()) && attackerClan.isAtWarWith(getClanId()))
 				{
 					return true;
 				}
@@ -8024,7 +8029,7 @@ public class Player extends Playable
 			}
 			
 			// Check if the attacker is not in the same clan
-			if ((_clan != null) && _clan.isMember(attacker.getObjectId()))
+			if ((clan != null) && clan.isMember(attacker.getObjectId()))
 			{
 				return false;
 			}
@@ -8036,7 +8041,7 @@ public class Player extends Playable
 			}
 			
 			// Now check again if the Player is in pvp zone, but this time at siege PvP zone, applying clan/ally checks
-			if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && (isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE)))
+			if (isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP) && isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8454,28 +8454,33 @@ public class Player extends Playable
 			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
-			if (_clan != null)
+			final Clan clan = getClan();
+			final Clan attackerClan = attackerPlayer.getClan();
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
 					{
 						// Check if a siege is in progress and if attacker and the Player aren't in the Defender clan.
-					if (siege.checkIsDefender(attackerPlayer.getClan()) && siege.checkIsDefender(getClan()))
+						if (siege.checkIsDefender(attackerClan) && siege.checkIsDefender(clan))
 						{
 							return false;
 						}
 						
 						// Check if a siege is in progress and if attacker and the Player aren't in the Attacker clan.
-					if (siege.checkIsAttacker(attackerPlayer.getClan()) && siege.checkIsAttacker(getClan()))
+						if (siege.checkIsAttacker(attackerClan) && siege.checkIsAttacker(clan))
 						{
 							// If first mid victory is achieved, attackers can attack attackers.
 							final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((getClan() != null) && (attackerPlayer.getClan() != null) && getClan().isAtWarWith(attackerPlayer.getClanId()) && attackerPlayer.getClan().isAtWarWith(getClanId()) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember() && clan.isAtWarWith(attackerPlayer.getClanId()) && attackerClan.isAtWarWith(getClanId()))
 				{
 					return true;
 				}
@@ -8489,7 +8494,7 @@ public class Player extends Playable
 			}
 			
 			// Check if the attacker is not in the same clan
-			if ((_clan != null) && _clan.isMember(attacker.getObjectId()))
+			if ((clan != null) && clan.isMember(attacker.getObjectId()))
 			{
 				return false;
 			}
@@ -8501,7 +8506,7 @@ public class Player extends Playable
 			}
 			
 			// Now check again if the Player is in pvp zone, but this time at siege PvP zone, applying clan/ally checks
-			if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && (isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE)))
+			if (isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP) && isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8338,28 +8338,33 @@ public class Player extends Playable
 			
 			// Get Player
 			final Player attackerPlayer = attacker.getActingPlayer();
-			if (_clan != null)
+			final Clan clan = getClan();
+			final Clan attackerClan = attackerPlayer.getClan();
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
 					{
 						// Check if a siege is in progress and if attacker and the Player aren't in the Defender clan.
-					if (siege.checkIsDefender(attackerPlayer.getClan()) && siege.checkIsDefender(getClan()))
+						if (siege.checkIsDefender(attackerClan) && siege.checkIsDefender(clan))
 						{
 							return false;
 						}
 						
 						// Check if a siege is in progress and if attacker and the Player aren't in the Attacker clan.
-					if (siege.checkIsAttacker(attackerPlayer.getClan()) && siege.checkIsAttacker(getClan()))
+						if (siege.checkIsAttacker(attackerClan) && siege.checkIsAttacker(clan))
 						{
 							// If first mid victory is achieved, attackers can attack attackers.
 							final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((getClan() != null) && (attackerPlayer.getClan() != null) && getClan().isAtWarWith(attackerPlayer.getClanId()) && attackerPlayer.getClan().isAtWarWith(getClanId()) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember() && clan.isAtWarWith(attackerPlayer.getClanId()) && attackerClan.isAtWarWith(getClanId()))
 				{
 					return true;
 				}
@@ -8373,7 +8378,7 @@ public class Player extends Playable
 			}
 			
 			// Check if the attacker is not in the same clan
-			if ((_clan != null) && _clan.isMember(attacker.getObjectId()))
+			if ((clan != null) && clan.isMember(attacker.getObjectId()))
 			{
 				return false;
 			}
@@ -8385,7 +8390,7 @@ public class Player extends Playable
 			}
 			
 			// Now check again if the Player is in pvp zone, but this time at siege PvP zone, applying clan/ally checks
-			if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && (isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE)))
+			if (isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP) && isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8146,7 +8146,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8165,9 +8167,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8208,13 +8211,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8157,7 +8157,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8176,9 +8178,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8219,13 +8222,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8157,7 +8157,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8176,9 +8178,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8219,13 +8222,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8157,7 +8157,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8176,9 +8178,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8219,13 +8222,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8143,7 +8143,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8162,9 +8164,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8205,13 +8208,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8186,7 +8186,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8205,9 +8207,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8248,13 +8251,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8233,7 +8233,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8252,9 +8254,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8295,13 +8298,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8186,7 +8186,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8205,9 +8207,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8248,13 +8251,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8143,7 +8143,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8162,9 +8164,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8205,13 +8208,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8132,7 +8132,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8151,9 +8153,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8194,13 +8197,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8286,7 +8286,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8305,9 +8307,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8348,13 +8351,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8410,7 +8410,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8429,9 +8431,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8472,13 +8475,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8648,7 +8648,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8667,9 +8669,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8710,13 +8713,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -8648,7 +8648,9 @@ public class Player extends Playable
 			final Player attackerPlayer = attacker.getActingPlayer();
 			final Clan clan = getClan();
 			final Clan attackerClan = attackerPlayer.getClan();
-			if (clan != null)
+			if ((clan != null) && (attackerClan != null))
+			{
+				if (clan != attackerClan)
 				{
 					final Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
 					if (siege != null)
@@ -8667,9 +8669,10 @@ public class Player extends Playable
 							return (castle != null) && castle.isFirstMidVictory();
 						}
 					}
+				}
 				
 				// Check if clan is at war
-				if ((attackerClan != null) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
+				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
 					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
@@ -8710,13 +8713,10 @@ public class Player extends Playable
 			}
 		}
 		
-		if (attacker instanceof Defender)
+		if ((attacker instanceof Defender) && (_clan != null))
-		{
-			if (_clan != null)
 		{
 			final Siege siege = SiegeManager.getInstance().getSiege(this);
-				return ((siege != null) && siege.checkIsAttacker(_clan));
+			return (siege != null) && siege.checkIsAttacker(_clan);
-			}
 		}
 		
 		if (attacker instanceof Guard)