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

DailyTaskManager weekly reset improvements.

Browse Source 
Thanks to nasseka.
This commit is contained in:
MobiusDevelopment
2021-06-27 14:58:44 +00:00
parent b6c5d53a3c
commit cabfc01be6
28 changed files with 360 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/TimedHuntingZoneData.xml vendored
View File

@@ -3,7 +3,6 @@
<zone id="2" name="Ancient Pirates' Tomb">
<enterLocation>17613,-76862,-6265</enterLocation>
<initialTime>3600</initialTime> <!-- 1 hour -->
<resetDelay>36000</resetDelay> <!-- 10 hours -->
<maxAddedTime>18000</maxAddedTime> <!-- 5 hours -->
<remainRefillTime>3600</remainRefillTime>
<refillTimeMax>3600</refillTimeMax>

6
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/events/DailyTasks.xml vendored
View File

@@ -23,12 +23,16 @@
<event name="#onClanLeaderApply" />
</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>
<!-- Schedule the vitality reset task every WEDNESDAY at 6:30 -->
<!-- <schedule name="vitalityReset" hour="06" minute="30" dayOfWeek="3">
<event name="#onVitalityReset" />
</schedule> -->
<!-- Attach condition to reset if server boots up in after 6:30 and hasn't reset yet -->
<!-- <conditionalSchedule>
<run name="reset" if="HASNT_RUN" />

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/TimedHuntingZoneData.xsd vendored
View File

@@ -7,7 +7,7 @@
<xs:sequence>
<xs:element type="xs:string" name="enterLocation" />
<xs:element type="xs:int" name="initialTime" />
<xs:element type="xs:int" name="resetDelay" />
<xs:element type="xs:int" name="resetDelay" minOccurs="0" />
<xs:element type="xs:int" name="maxAddedTime" />
<xs:element type="xs:int" name="remainRefillTime" minOccurs="0" />
<xs:element type="xs:int" name="refillTimeMax" minOccurs="0" />

38
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
View File

@@ -27,6 +27,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.DailyMissionData;
import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -38,6 +39,7 @@ import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager;
import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.holders.SubClassHolder;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
@@ -71,6 +73,7 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
resetWorldChatPoints();
resetTrainingCamp();
resetVip();
onResetTimedHuntingZones();
}
@ScheduleTarget
@@ -280,6 +283,41 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
DailyMissionData.getInstance().getDailyMissionData().forEach(DailyMissionDataHolder::reset);
}
@ScheduleTarget
public void onResetTimedHuntingZones()
{
for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones())
{
if (holder.getResetDelay() > 0)
{
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 Training Camp: ", 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("Special Hunting Zones has been resetted.");
}
public static DailyTaskManager getInstance()
{
return SingletonHolder.INSTANCE;