Ally crest related adjustments.
This commit is contained in:
@@ -2095,6 +2095,7 @@ public class Clan
|
|||||||
|
|
||||||
setAllyId(0);
|
setAllyId(0);
|
||||||
setAllyName(null);
|
setAllyName(null);
|
||||||
|
changeAllyCrest(0, false);
|
||||||
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000), PENALTY_TYPE_DISSOLVE_ALLY);
|
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000), PENALTY_TYPE_DISSOLVE_ALLY);
|
||||||
updateClanInDB();
|
updateClanInDB();
|
||||||
|
|
||||||
@@ -2368,7 +2369,7 @@ public class Clan
|
|||||||
{
|
{
|
||||||
for (Clan clan : ClanTable.getInstance().getClans())
|
for (Clan clan : ClanTable.getInstance().getClans())
|
||||||
{
|
{
|
||||||
if ((clan.getAllyId() == getAllyId()) && (clan.getClanId() != getClanId()))
|
if (clan.getAllyId() == getAllyId())
|
||||||
{
|
{
|
||||||
clan.setAllyCrestId(crestId);
|
clan.setAllyCrestId(crestId);
|
||||||
for (PlayerInstance member : clan.getOnlineMembers())
|
for (PlayerInstance member : clan.getOnlineMembers())
|
||||||
|
|||||||
@@ -2112,6 +2112,7 @@ public class Clan
|
|||||||
|
|
||||||
setAllyId(0);
|
setAllyId(0);
|
||||||
setAllyName(null);
|
setAllyName(null);
|
||||||
|
changeAllyCrest(0, false);
|
||||||
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000), PENALTY_TYPE_DISSOLVE_ALLY);
|
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000), PENALTY_TYPE_DISSOLVE_ALLY);
|
||||||
updateClanInDB();
|
updateClanInDB();
|
||||||
|
|
||||||
@@ -2385,7 +2386,7 @@ public class Clan
|
|||||||
{
|
{
|
||||||
for (Clan clan : ClanTable.getInstance().getClans())
|
for (Clan clan : ClanTable.getInstance().getClans())
|
||||||
{
|
{
|
||||||
if ((clan.getAllyId() == getAllyId()) && (clan.getClanId() != getClanId()))
|
if (clan.getAllyId() == getAllyId())
|
||||||
{
|
{
|
||||||
clan.setAllyCrestId(crestId);
|
clan.setAllyCrestId(crestId);
|
||||||
for (PlayerInstance member : clan.getOnlineMembers())
|
for (PlayerInstance member : clan.getOnlineMembers())
|
||||||
|
|||||||
Reference in New Issue
Block a user