Reduce reputation when war is canceled.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,8 +183,7 @@ 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()));
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,8 +183,7 @@ 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()));
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,8 +183,7 @@ 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()));
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,8 +183,7 @@ 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()));
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,9 +183,8 @@ 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);
-			cancelor.takeReputationScore(5000, true);
 		
 		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
 		
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,9 +183,8 @@ 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);
-			cancelor.takeReputationScore(5000, true);
 		
 		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
 		
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java

@@ -183,9 +183,8 @@ 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);
-			cancelor.takeReputationScore(5000, true);
 		
 		player.sendPacket(new SurrenderPledgeWar(cancelor.getName(), player.getName()));
 		
@@ -205,7 +204,6 @@ public final class ClanWar
 			ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId());
 		}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
 	}
-	}
 	
 	public void clanWarTimeout()
 	{

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))