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

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.");
allianceCheck();
restorewars();
restoreClanWars();
}
/**
@ -369,7 +369,7 @@ public class ClanTable
return false;
}
public void storeclanswars(int clanId1, int clanId2)
public void storeClanWars(int clanId1, int clanId2)
{
final L2Clan clan1 = getClan(clanId1);
final L2Clan clan2 = getClan(clanId2);
@ -408,7 +408,7 @@ public class ClanTable
clan2.broadcastToOnlineMembers(msg);
}
public void deleteclanswars(int clanId1, int clanId2)
public void deleteClanWars(int clanId1, int clanId2)
{
final L2Clan clan1 = getClan(clanId1);
final L2Clan clan2 = getClan(clanId2);
@ -455,11 +455,11 @@ public class ClanTable
{
clan1.deleteEnemyClan(clan2);
clan2.deleteEnemyClan(clan1);
deleteclanswars(clan1.getId(), clan2.getId());
deleteClanWars(clan1.getId(), clan2.getId());
}
}
private void restorewars()
private void restoreClanWars()
{
L2Clan clan1;
L2Clan clan2;

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)
{
ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId());
}
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)
{
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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)
{
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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;
}
ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getId());
ClanTable.getInstance().storeClanWars(player.getClanId(), clan.getId());
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))
{

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);
msg.addString(_pledgeName);
activeChar.sendPacket(msg);
ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId());
ClanTable.getInstance().deleteClanWars(_clan.getId(), clan.getId());
// Zoey76: TODO: Implement or cleanup.
// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
// if ((leader != null) && (leader.isOnline() == 0))