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_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.");
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();

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())
{
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());
}
}

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)
{
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)
{
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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)
{
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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);
ClanTable.getInstance().storeclanswars(newClanWar);
ClanTable.getInstance().storeClanWars(newClanWar);
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.
playerClan.takeReputationScore(5000, true);
ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
ClanTable.getInstance().deleteClanWars(playerClan.getId(), clan.getId());
for (L2PcInstance member : playerClan.getOnlineMembers(0))
{