lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted revision 8919 timed hunting zone changes.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2021-07-02 23:07:29 +00:00
parent 082e6cc2f9
commit 8a311baada
24 changed files with 372 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/TimedHuntingZoneData.xml vendored
View File

@@ -3,6 +3,7 @@
<zone id="1" name="Storm Isle">
<enterLocation>194291,176604,-1888</enterLocation>
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>36000</resetDelay> <!-- 10 hours -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>3600</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>
@@ -13,6 +14,7 @@
<zone id="6" name="Primeval Isle">
<enterLocation>9400,-21720,-3634</enterLocation>
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>36000</resetDelay> <!-- 10 hours -->
<maxAddedTime>21600</maxAddedTime> <!-- 6 hours -->
<remainRefillTime>3600</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>

5
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/events/DailyTasks.xml vendored
View File

@@ -24,8 +24,8 @@
</schedule>
<!-- Schedule the weekly timed hunting zones reset task every WEDNESDAY at 6:30 -->
<schedule name="timedHuntingZoneReset" hour="06" minute="30" dayOfWeek="3">
<event name="#onResetTimedHuntingZones" />
<schedule name="weeklytimedHuntingZoneReset" hour="06" minute="30" dayOfWeek="3">
<event name="#onResetWeeklyTimedHuntingZones" />
</schedule>
<!-- Schedule the weekly Throne of Heroes reset task every WEDNESDAY at 6:30 -->
@@ -42,6 +42,7 @@
<!-- Attach condition to reset if server boots up in after 6:30 and hasn't reset yet -->
<conditionalSchedule>
<run name="reset" if="HASNT_RUN" />
<run name="weeklytimedHuntingZoneReset" if="HASNT_RUN" />
<run name="clanLeaderApply" if="HASNT_RUN" />
<run name="vitalityReset" if="HASNT_RUN" />
</conditionalSchedule>

39
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@@ -260,7 +260,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
{
for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones())
{
if (holder.getResetDelay() > 0)
if (holder.isWeekly())
{
continue;
}
@@ -275,7 +275,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "Could not reset Training Camp: ", e);
LOGGER.log(Level.SEVERE, "Could not reset Special Hunting Zones: ", e);
}
// Update data for online players.
@@ -290,6 +290,41 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
LOGGER.info("Special Hunting Zones has been resetted.");
}
@ScheduleTarget
public void onResetWeeklyTimedHuntingZones()
{
for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones())
{
if (!holder.isWeekly())
{
continue;
}
// Update data for offline players.
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var IN (?, ?)"))
{
ps.setString(1, PlayerVariables.HUNTING_ZONE_ENTRY + holder.getZoneId());
ps.setString(2, PlayerVariables.HUNTING_ZONE_TIME + holder.getZoneId());
ps.executeUpdate();
}
catch (Exception e)
{
LOGGER.log(Level.SEVERE, "Could not reset Weekly Special Hunting Zones: ", e);
}
// Update data for online players.
World.getInstance().getPlayers().stream().forEach(player ->
{
player.getVariables().remove(PlayerVariables.HUNTING_ZONE_ENTRY + holder.getZoneId());
player.getVariables().remove(PlayerVariables.HUNTING_ZONE_TIME + holder.getZoneId());
player.getVariables().storeMe();
});
}
LOGGER.info("Weekly Special Hunting Zones has been resetted.");
}
public static DailyTaskManager getInstance()
{
return SingletonHolder.INSTANCE;