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

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)
{
ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().storeClanWars(requestor.getClanId(), activeChar.getClanId());
}
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)
{
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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)
{
requestor.deathPenalty(false);
ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
ClanTable.getInstance().deleteClanWars(requestor.getClanId(), activeChar.getClanId());
}
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);
// leader.sendPacket(new StartPledgeWar(_clan.getName(),player.getName()));
ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getClanId());
ClanTable.getInstance().storeClanWars(player.getClanId(), clan.getClanId());
for (L2PcInstance cha : L2World.getInstance().getAllPlayers())
{
if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan))

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;
// }
ClanTable.getInstance().deleteclanswars(playerClan.getClanId(), clan.getClanId());
ClanTable.getInstance().deleteClanWars(playerClan.getClanId(), clan.getClanId());
for (L2PcInstance cha : L2World.getInstance().getAllPlayers())
{
if ((cha.getClan() == player.getClan()) || (cha.getClan() == clan))

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);
_activeChar.sendPacket(msg);
_activeChar.deathPenalty(false);
ClanTable.getInstance().deleteclanswars(_clan.getClanId(), clan.getClanId());
ClanTable.getInstance().deleteClanWars(_clan.getClanId(), clan.getClanId());
}
}