From 4c09d669cf99062533aebafda2d1404cea6fb93a Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 6 Sep 2018 23:25:46 +0000
Subject: [PATCH] Reduce reputation when war is canceled.

---
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 .../l2jmobius/gameserver/model/ClanWar.java   | 40 +++++++++----------
 .../clientpackets/RequestStopPledgeWar.java   | 22 ++--------
 14 files changed, 154 insertions(+), 280 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java
index eea3375661..d47f2e3435 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(5000, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..5be51eec3b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(5000, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java
index eea3375661..d47f2e3435 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(5000, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..5be51eec3b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(5000, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java
index eea3375661..d47f2e3435 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(5000, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..5be51eec3b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(5000, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java
index eea3375661..d47f2e3435 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(5000, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..5be51eec3b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(5000, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java
index cb821eee0f..a60e92206c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(500, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..2ec452c581 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(500, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java
index cb821eee0f..a60e92206c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(500, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..2ec452c581 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(500, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java
index cb821eee0f..a60e92206c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java
@@ -183,28 +183,26 @@ public final class ClanWar
 	{
 		final L2Clan winnerClan = cancelor.getId() == _attackerClanId ? ClanTable.getInstance().getClan(_attackedClanId) : ClanTable.getInstance().getClan(_attackerClanId);
 		
-		if (cancelor.getReputationScore() > 5000)
+		// Reduce reputation.
+		cancelor.takeReputationScore(500, true);
+		
+		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
+		sm.addString(winnerClan.getName());
+		cancelor.broadcastToOnlineMembers(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
+		sm.addString(cancelor.getName());
+		winnerClan.broadcastToOnlineMembers(sm);
+		
+		_winnerClanId = winnerClan.getId();
+		_endTime = System.currentTimeMillis();
+		
+		ThreadPool.schedule(() ->
 		{
-			cancelor.takeReputationScore(5000, true);
-			
-			player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
-			
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_YOUR_DEFEAT_DECLARATION_WITH_THE_S1_CLAN);
-			sm.addString(winnerClan.getName());
-			cancelor.broadcastToOnlineMembers(sm);
-			
-			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_WAR_ENDED_BY_THE_S1_CLAN_S_DEFEAT_DECLARATION_YOU_HAVE_WON_THE_CLAN_WAR_OVER_THE_S1_CLAN);
-			sm.addString(cancelor.getName());
-			winnerClan.broadcastToOnlineMembers(sm);
-			
-			_winnerClanId = winnerClan.getId();
-			_endTime = System.currentTimeMillis();
-			
-			ThreadPool.schedule(() ->
-			{
-				ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
-			}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
-		}
+			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
+		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
 	
 	public void clanWarTimeout()
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index e9f26c9b11..2ec452c581 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -75,25 +75,6 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			return;
 		}
 		
-		// LOGGER.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
-		// + playerClan.getName() + " to clan: " + _pledgeName);
-		
-		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
-		// if(leader != null && leader.isOnline() == 0)
-		// {
-		// player.sendMessage("Clan leader isn't online.");
-		// player.sendPacket(ActionFailed.STATIC_PACKET);
-		// return;
-		// }
-		
-		// if (leader.isProcessingRequest())
-		// {
-		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
-		// sm.addString(leader.getName());
-		// player.sendPacket(sm);
-		// return;
-		// }
-		
 		for (L2ClanMember member : playerClan.getMembers())
 		{
 			if ((member == null) || (member.getPlayerInstance() == null))
@@ -107,6 +88,9 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
 			}
 		}
 		
+		// Reduce reputation.
+		playerClan.takeReputationScore(500, true);
+		
 		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
 		
 		for (L2PcInstance member : playerClan.getOnlineMembers(0))