Clan system adjustments.
Contributed by nasseka.
This commit is contained in:
parent
f668fc8352
commit
f3c4b6ef44
@ -523,9 +523,9 @@ StoreRecipeShopList = False
|
||||
# Default: False
|
||||
AltClanLeaderInstantActivation = False
|
||||
|
||||
# Number of days you have to wait before joining another clan.
|
||||
# Number of minutes you have to wait before joining another clan.
|
||||
# Default: 1
|
||||
DaysBeforeJoinAClan = 1
|
||||
MinutesBeforeJoinAClan = 1
|
||||
|
||||
# Number of days you have to wait before creating a new clan.
|
||||
# Default: 10
|
||||
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
|
||||
RemoveCastleCirclets = True
|
||||
|
||||
# Number of members needed to request a clan war.
|
||||
# Default: 15
|
||||
AltClanMembersForWar = 15
|
||||
# Default: 1
|
||||
AltClanMembersForWar = 1
|
||||
|
||||
# The the time that player must be online to be counted as online player and registered for clan bonus
|
||||
# Default: 30mins
|
||||
|
@ -267,7 +267,7 @@ public class Config
|
||||
public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
|
||||
public static double ALT_GAME_CREATION_SP_RATE;
|
||||
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION;
|
||||
public static int ALT_CLAN_JOIN_DAYS;
|
||||
public static int ALT_CLAN_JOIN_MINS;
|
||||
public static int ALT_CLAN_CREATE_DAYS;
|
||||
public static int ALT_CLAN_DISSOLVE_DAYS;
|
||||
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED;
|
||||
@ -1825,7 +1825,7 @@ public class Config
|
||||
ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
|
||||
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
|
||||
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false);
|
||||
ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1);
|
||||
ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1);
|
||||
ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
|
||||
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
|
||||
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);
|
||||
|
@ -1088,7 +1088,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
setAllyPenaltyExpiryTime(0, 0);
|
||||
}
|
||||
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time"));
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000
|
||||
{
|
||||
setCharPenaltyExpiryTime(0);
|
||||
}
|
||||
|
@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
// this also updates the database
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
|
||||
clan.updateClanInDB();
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
|
||||
|
@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
final Clan clan = player.getClan();
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
|
||||
sm.addString(player.getName());
|
||||
|
@ -523,9 +523,9 @@ StoreRecipeShopList = False
|
||||
# Default: False
|
||||
AltClanLeaderInstantActivation = False
|
||||
|
||||
# Number of days you have to wait before joining another clan.
|
||||
# Number of minutes you have to wait before joining another clan.
|
||||
# Default: 1
|
||||
DaysBeforeJoinAClan = 1
|
||||
MinutesBeforeJoinAClan = 1
|
||||
|
||||
# Number of days you have to wait before creating a new clan.
|
||||
# Default: 10
|
||||
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
|
||||
RemoveCastleCirclets = True
|
||||
|
||||
# Number of members needed to request a clan war.
|
||||
# Default: 15
|
||||
AltClanMembersForWar = 15
|
||||
# Default: 1
|
||||
AltClanMembersForWar = 1
|
||||
|
||||
# The the time that player must be online to be counted as online player and registered for clan bonus
|
||||
# Default: 30mins
|
||||
|
@ -267,7 +267,7 @@ public class Config
|
||||
public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
|
||||
public static double ALT_GAME_CREATION_SP_RATE;
|
||||
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION;
|
||||
public static int ALT_CLAN_JOIN_DAYS;
|
||||
public static int ALT_CLAN_JOIN_MINS;
|
||||
public static int ALT_CLAN_CREATE_DAYS;
|
||||
public static int ALT_CLAN_DISSOLVE_DAYS;
|
||||
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED;
|
||||
@ -1829,7 +1829,7 @@ public class Config
|
||||
ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
|
||||
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
|
||||
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false);
|
||||
ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1);
|
||||
ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1);
|
||||
ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
|
||||
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
|
||||
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);
|
||||
|
@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
setAllyPenaltyExpiryTime(0, 0);
|
||||
}
|
||||
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time"));
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000
|
||||
{
|
||||
setCharPenaltyExpiryTime(0);
|
||||
}
|
||||
@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(target.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return false;
|
||||
}
|
||||
|
@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
// this also updates the database
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
|
||||
clan.updateClanInDB();
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
|
||||
|
@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(player.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return;
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
final Clan clan = player.getClan();
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
|
||||
sm.addString(player.getName());
|
||||
|
@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
player.sendPacket(new ExPledgeBonusOpen(player));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000));
|
||||
player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
|
||||
}
|
||||
}
|
||||
|
@ -523,9 +523,9 @@ StoreRecipeShopList = False
|
||||
# Default: False
|
||||
AltClanLeaderInstantActivation = False
|
||||
|
||||
# Number of days you have to wait before joining another clan.
|
||||
# Number of minutes you have to wait before joining another clan.
|
||||
# Default: 1
|
||||
DaysBeforeJoinAClan = 1
|
||||
MinutesBeforeJoinAClan = 1
|
||||
|
||||
# Number of days you have to wait before creating a new clan.
|
||||
# Default: 10
|
||||
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
|
||||
RemoveCastleCirclets = True
|
||||
|
||||
# Number of members needed to request a clan war.
|
||||
# Default: 15
|
||||
AltClanMembersForWar = 15
|
||||
# Default: 1
|
||||
AltClanMembersForWar = 1
|
||||
|
||||
# The the time that player must be online to be counted as online player and registered for clan bonus
|
||||
# Default: 30mins
|
||||
|
@ -268,7 +268,7 @@ public class Config
|
||||
public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
|
||||
public static double ALT_GAME_CREATION_SP_RATE;
|
||||
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION;
|
||||
public static int ALT_CLAN_JOIN_DAYS;
|
||||
public static int ALT_CLAN_JOIN_MINS;
|
||||
public static int ALT_CLAN_CREATE_DAYS;
|
||||
public static int ALT_CLAN_DISSOLVE_DAYS;
|
||||
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED;
|
||||
@ -1836,7 +1836,7 @@ public class Config
|
||||
ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
|
||||
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
|
||||
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false);
|
||||
ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1);
|
||||
ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1);
|
||||
ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
|
||||
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
|
||||
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);
|
||||
|
@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
setAllyPenaltyExpiryTime(0, 0);
|
||||
}
|
||||
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time"));
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000
|
||||
{
|
||||
setCharPenaltyExpiryTime(0);
|
||||
}
|
||||
@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(target.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return false;
|
||||
}
|
||||
|
@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
// this also updates the database
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
|
||||
clan.updateClanInDB();
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
|
||||
|
@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(player.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return;
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
final Clan clan = player.getClan();
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
|
||||
sm.addString(player.getName());
|
||||
|
@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
player.sendPacket(new ExPledgeBonusOpen(player));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000));
|
||||
player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
|
||||
}
|
||||
}
|
||||
|
@ -523,9 +523,9 @@ StoreRecipeShopList = False
|
||||
# Default: False
|
||||
AltClanLeaderInstantActivation = False
|
||||
|
||||
# Number of days you have to wait before joining another clan.
|
||||
# Number of minutes you have to wait before joining another clan.
|
||||
# Default: 1
|
||||
DaysBeforeJoinAClan = 1
|
||||
MinutesBeforeJoinAClan = 1
|
||||
|
||||
# Number of days you have to wait before creating a new clan.
|
||||
# Default: 10
|
||||
@ -568,8 +568,8 @@ AltMembersCanWithdrawFromClanWH = False
|
||||
RemoveCastleCirclets = True
|
||||
|
||||
# Number of members needed to request a clan war.
|
||||
# Default: 15
|
||||
AltClanMembersForWar = 15
|
||||
# Default: 1
|
||||
AltClanMembersForWar = 1
|
||||
|
||||
# The the time that player must be online to be counted as online player and registered for clan bonus
|
||||
# Default: 30mins
|
||||
|
@ -268,7 +268,7 @@ public class Config
|
||||
public static double ALT_GAME_CREATION_RARE_XPSP_RATE;
|
||||
public static double ALT_GAME_CREATION_SP_RATE;
|
||||
public static boolean ALT_CLAN_LEADER_INSTANT_ACTIVATION;
|
||||
public static int ALT_CLAN_JOIN_DAYS;
|
||||
public static int ALT_CLAN_JOIN_MINS;
|
||||
public static int ALT_CLAN_CREATE_DAYS;
|
||||
public static int ALT_CLAN_DISSOLVE_DAYS;
|
||||
public static int ALT_ALLY_JOIN_DAYS_WHEN_LEAVED;
|
||||
@ -1836,7 +1836,7 @@ public class Config
|
||||
ALT_GAME_CREATION_SP_RATE = characterConfig.getDouble("AltGameCreationSpRate", 1);
|
||||
ALT_GAME_CREATION_RARE_XPSP_RATE = characterConfig.getDouble("AltGameCreationRareXpSpRate", 2);
|
||||
ALT_CLAN_LEADER_INSTANT_ACTIVATION = characterConfig.getBoolean("AltClanLeaderInstantActivation", false);
|
||||
ALT_CLAN_JOIN_DAYS = characterConfig.getInt("DaysBeforeJoinAClan", 1);
|
||||
ALT_CLAN_JOIN_MINS = characterConfig.getInt("MinutesBeforeJoinAClan", 1);
|
||||
ALT_CLAN_CREATE_DAYS = characterConfig.getInt("DaysBeforeCreateAClan", 10);
|
||||
ALT_CLAN_DISSOLVE_DAYS = characterConfig.getInt("DaysToPassToDissolveAClan", 7);
|
||||
ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = characterConfig.getInt("DaysBeforeJoinAllyWhenLeaved", 1);
|
||||
|
@ -1109,7 +1109,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
setAllyPenaltyExpiryTime(0, 0);
|
||||
}
|
||||
setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time"));
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000
|
||||
if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_MINS * 60000)) < System.currentTimeMillis()) // 24*60*60*1000 = 60000
|
||||
{
|
||||
setCharPenaltyExpiryTime(0);
|
||||
}
|
||||
@ -2234,7 +2234,7 @@ public class Clan implements IIdentifiable, INamable
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(target.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return false;
|
||||
}
|
||||
|
@ -81,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
// this also updates the database
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 86400000)); // 60*1000 = 60000
|
||||
clan.updateClanInDB();
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN);
|
||||
|
@ -74,7 +74,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
|
||||
{
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE);
|
||||
sm.addString(player.getName());
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_DAYS);
|
||||
sm.addInt(Config.ALT_CLAN_JOIN_MINS);
|
||||
player.sendPacket(sm);
|
||||
return;
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
final Clan clan = player.getClan();
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000
|
||||
clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_MINS * 60000)); // 60*1000 = 60000
|
||||
|
||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
|
||||
sm.addString(player.getName());
|
||||
|
@ -45,7 +45,7 @@ public class RequestPledgeBonusOpen implements IClientIncomingPacket
|
||||
}
|
||||
|
||||
player.sendPacket(new ExPledgeBonusOpen(player));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_DAYS * 60000));
|
||||
final long joinedTime = (player.getClanJoinExpiryTime() - (Config.ALT_CLAN_JOIN_MINS * 60000));
|
||||
player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (joinedTime + 86400000) < System.currentTimeMillis()));
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user