lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code format changes for ClanTable class.

Browse Source
This commit is contained in:
MobiusDev
2019-02-23 13:43:34 +00:00
parent 93048b2592
commit f8fbb57f95
84 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -105,7 +105,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -148,17 +148,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -168,18 +168,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -350,7 +350,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -396,7 +396,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -105,7 +105,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -148,17 +148,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -168,18 +168,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -350,7 +350,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -396,7 +396,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(5000, true); playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java
View File

@@ -152,7 +152,7 @@ public class ClanTable
LOGGER.warning("Data error on ClanTable " + e); LOGGER.warning("Data error on ClanTable " + e);
} }
restorewars(); restoreClanWars();
} }
/** /**
@@ -452,7 +452,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(int clanId1, int clanId2) public void storeClanWars(int clanId1, int clanId2)
{ {
final L2Clan clan1 = getInstance().getClan(clanId1); final L2Clan clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -486,7 +486,7 @@ public class ClanTable
clan2.broadcastToOnlineMembers(msg); 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -534,11 +534,11 @@ public class ClanTable
{ {
clan1.deleteEnemyClan(clan2); clan1.deleteEnemyClan(clan2);
clan2.deleteEnemyClan(clan1); clan2.deleteEnemyClan(clan1);
deleteclanswars(clan1.getClanId(), clan2.getClanId()); deleteClanWars(clan1.getClanId(), clan2.getClanId());
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection()) try (Connection con = DatabaseFactory.getConnection())
{ {

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -49,7 +49,7 @@ public final class RequestReplyStartPledgeWar extends L2GameClientPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -49,7 +49,7 @@ public final class RequestReplyStopPledgeWar extends L2GameClientPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -49,7 +49,7 @@ public final class RequestReplySurrenderPledgeWar extends L2GameClientPacket
if (_answer == 1) if (_answer == 1)
{ {
requestor.deathPenalty(false); requestor.deathPenalty(false);
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar extends L2GameClientPacket
// player.setTransactionRequester(leader); // player.setTransactionRequester(leader);
// leader.sendPacket(new StartPledgeWar(_clan.getName(),player.getName())); // 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()) for (L2PcInstance cha : L2World.getInstance().getAllPlayers())
{ {
if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan)) if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan))

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -89,7 +89,7 @@ public final class RequestStopPledgeWar extends L2GameClientPacket
// return; // return;
// } // }
ClanTable.getInstance().deleteclanswars(playerClan.getClanId(), clan.getClanId()); ClanTable.getInstance().deleteClanWars(playerClan.getClanId(), clan.getClanId());
for (L2PcInstance cha : L2World.getInstance().getAllPlayers()) for (L2PcInstance cha : L2World.getInstance().getAllPlayers())
{ {
if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan)) if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan))

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@@ -75,6 +75,6 @@ public final class RequestSurrenderPledgeWar extends L2GameClientPacket
msg.addString(_pledgeName); msg.addString(_pledgeName);
_activeChar.sendPacket(msg); _activeChar.sendPacket(msg);
_activeChar.deathPenalty(false); _activeChar.deathPenalty(false);
ClanTable.getInstance().deleteclanswars(_clan.getClanId(), clan.getClanId()); ClanTable.getInstance().deleteClanWars(_clan.getClanId(), clan.getClanId());
} }
} }

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -107,7 +107,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -369,7 +369,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(int clanId1, int clanId2) public void storeClanWars(int clanId1, int clanId2)
{ {
final L2Clan clan1 = getClan(clanId1); final L2Clan clan1 = getClan(clanId1);
final L2Clan clan2 = getClan(clanId2); final L2Clan clan2 = getClan(clanId2);
@@ -408,7 +408,7 @@ public class ClanTable
clan2.broadcastToOnlineMembers(msg); clan2.broadcastToOnlineMembers(msg);
} }
public void deleteclanswars(int clanId1, int clanId2) public void deleteClanWars(int clanId1, int clanId2)
{ {
final L2Clan clan1 = getClan(clanId1); final L2Clan clan1 = getClan(clanId1);
final L2Clan clan2 = getClan(clanId2); final L2Clan clan2 = getClan(clanId2);
@@ -455,11 +455,11 @@ public class ClanTable
{ {
clan1.deleteEnemyClan(clan2); clan1.deleteEnemyClan(clan2);
clan2.deleteEnemyClan(clan1); clan2.deleteEnemyClan(clan1);
deleteclanswars(clan1.getId(), clan2.getId()); deleteClanWars(clan1.getId(), clan2.getId());
} }
} }
private void restorewars() private void restoreClanWars()
{ {
L2Clan clan1; L2Clan clan1;
L2Clan clan2; L2Clan clan2;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -55,7 +55,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -55,7 +55,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -94,7 +94,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
return; return;
} }
ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getId()); ClanTable.getInstance().storeClanWars(player.getClanId(), clan.getId());
for (L2PcInstance member : _clan.getOnlineMembers(0)) for (L2PcInstance member : _clan.getOnlineMembers(0))
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -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)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
View File

@@ -70,7 +70,7 @@ public final class RequestSurrenderPledgeWar implements IClientIncomingPacket
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN); final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN);
msg.addString(_pledgeName); msg.addString(_pledgeName);
activeChar.sendPacket(msg); activeChar.sendPacket(msg);
ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(_clan.getId(), clan.getId());
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName()); // L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
// if ((leader != null) && (leader.isOnline() == 0)) // if ((leader != null) && (leader.isOnline() == 0))

20
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(500, true); playerClan.takeReputationScore(500, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(500, true); playerClan.takeReputationScore(500, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(500, true); playerClan.takeReputationScore(500, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {

20
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@@ -106,7 +106,7 @@ public class ClanTable
LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database.");
allianceCheck(); allianceCheck();
restorewars(); restoreClanWars();
} }
/** /**
@@ -149,17 +149,17 @@ public class ClanTable
*/ */
public L2Clan createClan(L2PcInstance player, String clanName) public L2Clan createClan(L2PcInstance player, String clanName)
{ {
if (null == player) if (player == null)
{ {
return 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); player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
return null; return null;
} }
if (0 != player.getClanId()) if (player.getClanId() != 0)
{ {
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null; return null;
@@ -169,18 +169,18 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null; return null;
} }
if (!Util.isAlphaNumeric(clanName) || (2 > clanName.length())) if (!Util.isAlphaNumeric(clanName) || (clanName.length() < 2))
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return null; return null;
} }
if (16 < clanName.length()) if (clanName.length() > 16)
{ {
player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT); player.sendPacket(SystemMessageId.CLAN_NAME_S_LENGTH_IS_INCORRECT);
return null; return null;
} }
if (null != getClanByName(clanName)) if (getClanByName(clanName) != null)
{ {
// clan name is already taken // clan name is already taken
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
@@ -354,7 +354,7 @@ public class ClanTable
return false; return false;
} }
public void storeclanswars(ClanWar war) public void storeClanWars(ClanWar war)
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state) VALUES(?,?,?,?,?,?,?,?)")) 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 clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2); final L2Clan clan2 = getInstance().getClan(clanId2);
@@ -400,7 +400,7 @@ public class ClanTable
} }
} }
private void restorewars() private void restoreClanWars()
{ {
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement(); Statement statement = con.createStatement();

8
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/ClanWar.java
View File

@@ -100,13 +100,13 @@ public final class ClanWar
if (endTimePeriod > System.currentTimeMillis()) if (endTimePeriod > System.currentTimeMillis())
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
} }
else else
{ {
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(_attackerClanId, _attackedClanId); ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
}, endTimePeriod); }, endTimePeriod);
} }
} }
@@ -201,7 +201,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(cancelor.getId(), winnerClan.getId()); ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
} }
@@ -225,7 +225,7 @@ public final class ClanWar
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
ClanTable.getInstance().deleteclanswars(attackerClan.getId(), attackedClan.getId()); ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId());
}, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); }, (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
} }
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
View File

@@ -65,7 +65,7 @@ public final class RequestReplyStartPledgeWar implements IClientIncomingPacket
if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION) if (clanWar.getState() == ClanWarState.BLOOD_DECLARATION)
{ {
clanWar.mutualClanWarAccepted(attacker, attacked); clanWar.mutualClanWarAccepted(attacker, attacked);
ClanTable.getInstance().storeclanswars(clanWar); ClanTable.getInstance().storeClanWars(clanWar);
} }
} }
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
View File

@@ -54,7 +54,7 @@ public final class RequestReplyStopPledgeWar implements IClientIncomingPacket
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
View File

@@ -50,7 +50,7 @@ public final class RequestReplySurrenderPledgeWar implements IClientIncomingPack
if (_answer == 1) if (_answer == 1)
{ {
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId()); ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
} }
else else
{ {

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@@ -131,7 +131,7 @@ public final class RequestStartPledgeWar implements IClientIncomingPacket
final ClanWar newClanWar = new ClanWar(clanDeclaringWar, clanDeclaredWar); 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)); clanDeclaringWar.getMembers().stream().filter(Objects::nonNull).filter(L2ClanMember::isOnline).forEach(p -> p.getPlayerInstance().broadcastUserInfo(UserInfoType.CLAN));

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
View File

@@ -91,7 +91,7 @@ public final class RequestStopPledgeWar implements IClientIncomingPacket
// Reduce reputation. // Reduce reputation.
playerClan.takeReputationScore(500, true); playerClan.takeReputationScore(500, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId()); ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0)) for (L2PcInstance member : playerClan.getOnlineMembers(0))
{ {