Code improvements.
This commit is contained in:
@ -51,10 +51,7 @@ public class TaskBirthday extends Task
|
||||
@Override
|
||||
public void onTimeElapsed(ExecutedTask task)
|
||||
{
|
||||
// TODO(Zoey76): Fix first run.
|
||||
final int birthdayGiftCount = giveBirthdayGifts(task.getLastActivation());
|
||||
|
||||
_log.info("BirthdayManager: " + birthdayGiftCount + " gifts sent.");
|
||||
_log.info("BirthdayManager: " + giveBirthdayGifts(task.getLastActivation()) + " gifts sent.");
|
||||
}
|
||||
|
||||
private int giveBirthdayGifts(long lastActivation)
|
||||
@ -68,10 +65,7 @@ public class TaskBirthday extends Task
|
||||
{
|
||||
while (rs.next())
|
||||
{
|
||||
String text = Config.ALT_BIRTHDAY_MAIL_TEXT;
|
||||
text = text.replaceAll("$c1", rs.getString("char_name"));
|
||||
text = text.replaceAll("$s1", Integer.toString(rs.getInt("age")));
|
||||
|
||||
final String text = Config.ALT_BIRTHDAY_MAIL_TEXT.replaceAll("$c1", rs.getString("char_name")).replaceAll("$s1", Integer.toString(rs.getInt("age")));
|
||||
final Message msg = new Message(rs.getInt("charId"), Config.ALT_BIRTHDAY_MAIL_SUBJECT, text, MailType.BIRTHDAY);
|
||||
msg.createAttachments().addItem("Birthday", Config.ALT_BIRTHDAY_GIFT, 1, null, null);
|
||||
MailManager.getInstance().sendMessage(msg);
|
||||
|
@ -43,24 +43,25 @@ public class TaskClanLeaderApply extends Task
|
||||
@Override
|
||||
public void onTimeElapsed(ExecutedTask task)
|
||||
{
|
||||
final Calendar cal = Calendar.getInstance();
|
||||
if (cal.get(Calendar.DAY_OF_WEEK) == Config.ALT_CLAN_LEADER_DATE_CHANGE)
|
||||
if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) != Config.ALT_CLAN_LEADER_DATE_CHANGE)
|
||||
{
|
||||
for (L2Clan clan : ClanTable.getInstance().getClans())
|
||||
{
|
||||
if (clan.getNewLeaderId() != 0)
|
||||
{
|
||||
final L2ClanMember member = clan.getClanMember(clan.getNewLeaderId());
|
||||
if (member == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
clan.setNewLeader(member);
|
||||
}
|
||||
}
|
||||
_log.info(getClass().getSimpleName() + ": launched.");
|
||||
return;
|
||||
}
|
||||
|
||||
for (L2Clan clan : ClanTable.getInstance().getClans())
|
||||
{
|
||||
if (clan.getNewLeaderId() != 0)
|
||||
{
|
||||
final L2ClanMember member = clan.getClanMember(clan.getNewLeaderId());
|
||||
if (member == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
clan.setNewLeader(member);
|
||||
}
|
||||
}
|
||||
_log.info(getClass().getSimpleName() + ": launched.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -47,26 +47,27 @@ public class TaskVitalityReset extends Task
|
||||
@Override
|
||||
public void onTimeElapsed(ExecutedTask task)
|
||||
{
|
||||
final Calendar cal = Calendar.getInstance();
|
||||
if (cal.get(Calendar.DAY_OF_WEEK) == Config.ALT_VITALITY_DATE_RESET)
|
||||
if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) != Config.ALT_VITALITY_DATE_RESET)
|
||||
{
|
||||
for (L2PcInstance player : L2World.getInstance().getPlayers())
|
||||
{
|
||||
player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
|
||||
}
|
||||
|
||||
try (Connection con = DatabaseFactory.getInstance().getConnection();
|
||||
PreparedStatement st = con.prepareStatement("DELETE FROM account_gsdata WHERE var = ?"))
|
||||
{
|
||||
st.setString(1, PcStat.VITALITY_VARIABLE);
|
||||
st.execute();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.log(Level.WARNING, "", e);
|
||||
}
|
||||
_log.info(getClass().getSimpleName() + ": launched.");
|
||||
return;
|
||||
}
|
||||
|
||||
for (L2PcInstance player : L2World.getInstance().getPlayers())
|
||||
{
|
||||
player.setVitalityPoints(PcStat.MAX_VITALITY_POINTS, false);
|
||||
}
|
||||
|
||||
try (Connection con = DatabaseFactory.getInstance().getConnection();
|
||||
PreparedStatement st = con.prepareStatement("DELETE FROM account_gsdata WHERE var = ?"))
|
||||
{
|
||||
st.setString(1, PcStat.VITALITY_VARIABLE);
|
||||
st.execute();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.log(Level.WARNING, "", e);
|
||||
}
|
||||
_log.info(getClass().getSimpleName() + ": launched.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user