Moved ChuseokHarvestFestival isEventPeriod check in reset event.

This commit is contained in:
MobiusDevelopment
2022-09-22 08:44:38 +00:00
parent 8f9d40d457
commit dbff20bb61

View File

@ -54,10 +54,7 @@ public class ChuseokHarvestFestival extends LongTimeEvent
addFirstTalkId(MOON_RABBIT, FULL_MOON); addFirstTalkId(MOON_RABBIT, FULL_MOON);
addTalkId(MOON_RABBIT, FULL_MOON); addTalkId(MOON_RABBIT, FULL_MOON);
if (isEventPeriod()) startQuestTimer("schedule", 1000, null, null);
{
startQuestTimer("schedule", 1000, null, null);
}
} }
@Override @Override
@ -114,25 +111,27 @@ public class ChuseokHarvestFestival extends LongTimeEvent
} }
case "reset": case "reset":
{ {
// Update data for offline players. if (isEventPeriod())
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
{ {
ps.setString(1, CHUSEOK_HARVEST_FESTIVAL_VAR); // Update data for offline players.
ps.executeUpdate(); try (Connection con = DatabaseFactory.getConnection();
} PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?"))
catch (Exception e) {
{ ps.setString(1, CHUSEOK_HARVEST_FESTIVAL_VAR);
LOGGER.log(Level.SEVERE, "Could not reset Chuseok Harvest Festival Event var: ", e); ps.executeUpdate();
} }
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "Could not reset Chuseok Harvest Festival Event var: ", e);
}
// Update data for online players. // Update data for online players.
for (Player plr : World.getInstance().getPlayers()) for (Player plr : World.getInstance().getPlayers())
{ {
plr.getVariables().remove(CHUSEOK_HARVEST_FESTIVAL_VAR); plr.getVariables().remove(CHUSEOK_HARVEST_FESTIVAL_VAR);
plr.getVariables().storeMe(); plr.getVariables().storeMe();
}
} }
cancelQuestTimers("schedule"); cancelQuestTimers("schedule");
startQuestTimer("schedule", 1000, null, null); startQuestTimer("schedule", 1000, null, null);
break; break;