diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 50109f6ab4..fa1754ebf6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -105,7 +105,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -148,17 +148,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -168,18 +168,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -350,7 +350,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -371,7 +371,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -396,7 +396,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 a6624e5179..ed230cb046 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 5be51eec3b..88456dc342 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 50109f6ab4..fa1754ebf6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -105,7 +105,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -148,17 +148,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -168,18 +168,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -350,7 +350,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -371,7 +371,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -396,7 +396,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 a6624e5179..ed230cb046 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 5be51eec3b..88456dc342 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 10f2925e44..9adfccaf3f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 a6624e5179..ed230cb046 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 5be51eec3b..88456dc342 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 44aee81ff0..41797aab2c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 a6624e5179..ed230cb046 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 5be51eec3b..88456dc342 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 44aee81ff0..41797aab2c 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/ClanWar.java index 14c0197750..ebbcf6156b 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/ClanWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/ClanWar.java @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 5be51eec3b..88456dc342 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 44aee81ff0..41797aab2c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/ClanWar.java index 28c3b94c9a..4772ece054 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/ClanWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/ClanWar.java @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 164458432d..90bc30022c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 5be51eec3b..88456dc342 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(5000, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java index 2cc03ea35f..3139c4af4e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java @@ -152,7 +152,7 @@ public class ClanTable LOGGER.warning("Data error on ClanTable " + e); } - restorewars(); + restoreClanWars(); } /** @@ -452,7 +452,7 @@ public class ClanTable return false; } - public void storeclanswars(int clanId1, int clanId2) + public void storeClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -486,7 +486,7 @@ public class ClanTable clan2.broadcastToOnlineMembers(msg); } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -534,11 +534,11 @@ public class ClanTable { clan1.deleteEnemyClan(clan2); clan2.deleteEnemyClan(clan1); - deleteclanswars(clan1.getClanId(), clan2.getClanId()); + deleteClanWars(clan1.getClanId(), clan2.getClanId()); } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 9ff975a0b4..f506fad724 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -49,7 +49,7 @@ public final class RequestReplyStartPledgeWar extends L2GameClientPacket if (_answer == 1) { - ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index e3a581d543..dee03e4779 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -49,7 +49,7 @@ public final class RequestReplyStopPledgeWar extends L2GameClientPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index e3ed89c53d..91ebf5f491 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -49,7 +49,7 @@ public final class RequestReplySurrenderPledgeWar extends L2GameClientPacket if (_answer == 1) { requestor.deathPenalty(false); - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index e49de48ca3..78c120321a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket // player.setTransactionRequester(leader); // leader.sendPacket(new StartPledgeWar(_clan.getName(),player.getName())); - ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getClanId()); + ClanTable.getInstance().storeClanWars(player.getClanId(), clan.getClanId()); for (L2PcInstance cha : L2World.getInstance().getAllPlayers()) { if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan)) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 9da1aba996..8789ac743d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -89,7 +89,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket // return; // } - ClanTable.getInstance().deleteclanswars(playerClan.getClanId(), clan.getClanId()); + ClanTable.getInstance().deleteClanWars(playerClan.getClanId(), clan.getClanId()); for (L2PcInstance cha : L2World.getInstance().getAllPlayers()) { if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan)) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 147ce2859e..21a0fccd75 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -75,6 +75,6 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket msg.addString(_pledgeName); _activeChar.sendPacket(msg); _activeChar.deathPenalty(false); - ClanTable.getInstance().deleteclanswars(_clan.getClanId(), clan.getClanId()); + ClanTable.getInstance().deleteClanWars(_clan.getClanId(), clan.getClanId()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index d636c5b16f..36675171a4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -107,7 +107,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -369,7 +369,7 @@ public class ClanTable return false; } - public void storeclanswars(int clanId1, int clanId2) + public void storeClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getClan(clanId1); final L2Clan clan2 = getClan(clanId2); @@ -408,7 +408,7 @@ public class ClanTable clan2.broadcastToOnlineMembers(msg); } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getClan(clanId1); final L2Clan clan2 = getClan(clanId2); @@ -455,11 +455,11 @@ public class ClanTable { clan1.deleteEnemyClan(clan2); clan2.deleteEnemyClan(clan1); - deleteclanswars(clan1.getId(), clan2.getId()); + deleteClanWars(clan1.getId(), clan2.getId()); } } - private void restorewars() + private void restoreClanWars() { L2Clan clan1; L2Clan clan2; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 631a99d8c4..22cd0c651f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -55,7 +55,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index a3842d28c2..a62a952c5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -55,7 +55,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index d2ef24cb44..46e54f2406 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 49cb88eaa6..12b9ba6306 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -94,7 +94,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket return; } - ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getId()); + ClanTable.getInstance().storeClanWars(player.getClanId(), clan.getId()); for (L2PcInstance member : _clan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 341beed24f..948f102147 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -107,7 +107,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket } } - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 2de1a7c590..a483132dbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -70,7 +70,7 @@ public final class RequestSurrenderPledgeWar implements IClientIncomingPacket final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN); msg.addString(_pledgeName); activeChar.sendPacket(msg); - ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(_clan.getId(), clan.getId()); // Zoey76: TODO: Implement or cleanup. // L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName()); // if ((leader != null) && (leader.isOnline() == 0)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 10f2925e44..9adfccaf3f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 8fb6425cb1..912e2d05d3 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 613e6030f7..4041c8b4aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 2ec452c581..6366559bcd 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(500, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 10f2925e44..9adfccaf3f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 8fb6425cb1..912e2d05d3 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 613e6030f7..4041c8b4aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 2ec452c581..6366559bcd 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(500, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 10f2925e44..9adfccaf3f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); 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 8fb6425cb1..912e2d05d3 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 @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 613e6030f7..4041c8b4aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); 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 2ec452c581..6366559bcd 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 @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(500, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 10f2925e44..9adfccaf3f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -106,7 +106,7 @@ public class ClanTable LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); - restorewars(); + restoreClanWars(); } /** @@ -149,17 +149,17 @@ public class ClanTable */ public L2Clan createClan(L2PcInstance player, String clanName) { - if (null == player) + if (player == null) { return null; } - if (10 > player.getLevel()) + if (player.getLevel() < 10) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN); return null; } - if (0 != player.getClanId()) + if (player.getClanId() != 0) { player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; @@ -169,18 +169,18 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; } - if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) + if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2)) { player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); return null; } - if (16 < clanName.length()) + if (clanName.length() > 16) { player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); return null; } - if (null != getClanByName(clanName)) + if (getClanByName(clanName) != null) { // clan name is already taken final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); @@ -354,7 +354,7 @@ public class ClanTable return false; } - public void storeclanswars(ClanWar war) + public void storeClanWars(ClanWar war) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) @@ -375,7 +375,7 @@ public class ClanTable } } - public void deleteclanswars(int clanId1, int clanId2) + public void deleteClanWars(int clanId1, int clanId2) { final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan2 = getInstance().getClan(clanId2); @@ -400,7 +400,7 @@ public class ClanTable } } - private void restorewars() + private void restoreClanWars() { try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/ClanWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/ClanWar.java index 8fb6425cb1..912e2d05d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/ClanWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/ClanWar.java @@ -100,13 +100,13 @@ public final class ClanWar if (endTimePeriod > System.currentTimeMillis()) { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); } else { ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); + ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId); }, endTimePeriod); } } @@ -201,7 +201,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); + ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } @@ -225,7 +225,7 @@ public final class ClanWar ThreadPool.schedule(() -> { - ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); + ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java index 584f9ceba9..b2e5f7a3cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java @@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) { clanWar.mutualClanWarAccepted(attacker, attacked); - ClanTable.getInstance().storeclanswars(clanWar); + ClanTable.getInstance().storeClanWars(clanWar); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java index f4d810985b..6babd11ca2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java @@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index 1a4ea38608..f872a26bdd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack if (_answer == 1) { - ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); + ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId()); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 613e6030f7..4041c8b4aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); - ClanTable.getInstance().storeclanswars(newClanWar); + ClanTable.getInstance().storeClanWars(newClanWar); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java index 2ec452c581..6366559bcd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java @@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket // Reduce reputation. playerClan.takeReputationScore(500, true); - ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); + ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId()); for (L2PcInstance member : playerClan.getOnlineMembers(0)) {