Merged with released L2J-Unity files.

trunk/java/com/l2jmobius/gameserver/model/eventengine/conditions/BetweenConditionalScheduler.java

@@ -0,0 +1,80 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.model.eventengine.conditions;
+
+import java.util.Objects;
+import java.util.logging.Logger;
+
+import com.l2jmobius.gameserver.model.eventengine.AbstractEventManager;
+import com.l2jmobius.gameserver.model.eventengine.EventScheduler;
+import com.l2jmobius.gameserver.model.eventengine.IConditionalEventScheduler;
+
+/**
+ * @author UnAfraid
+ */
+public class BetweenConditionalScheduler implements IConditionalEventScheduler
+{
+	private static final Logger LOGGER = Logger.getLogger(BetweenConditionalScheduler.class.getName());
+	private final AbstractEventManager<?> _eventManager;
+	private final String _name;
+	private final String _scheduler1;
+	private final String _scheduler2;
+	
+	public BetweenConditionalScheduler(AbstractEventManager<?> eventManager, String name, String scheduler1, String scheduler2)
+	{
+		Objects.requireNonNull(eventManager);
+		Objects.requireNonNull(name);
+		Objects.requireNonNull(scheduler1);
+		Objects.requireNonNull(scheduler2);
+		
+		_eventManager = eventManager;
+		_name = name;
+		_scheduler1 = scheduler1;
+		_scheduler2 = scheduler2;
+	}
+	
+	@Override
+	public boolean test()
+	{
+		final EventScheduler scheduler1 = _eventManager.getScheduler(_scheduler1);
+		final EventScheduler scheduler2 = _eventManager.getScheduler(_scheduler2);
+		if (scheduler1 == null)
+		{
+			throw new NullPointerException("Scheduler1 not found: " + _scheduler1);
+		}
+		else if (scheduler2 == null)
+		{
+			throw new NullPointerException("Scheduler2 not found: " + _scheduler2);
+		}
+		
+		final long previousStart = scheduler1.getPrevSchedule();
+		final long previousEnd = scheduler2.getPrevSchedule();
+		return previousStart > previousEnd;
+	}
+	
+	@Override
+	public void run()
+	{
+		final EventScheduler mainScheduler = _eventManager.getScheduler(_name);
+		if (mainScheduler == null)
+		{
+			throw new NullPointerException("Main scheduler not found: " + _name);
+		}
+		mainScheduler.run();
+		LOGGER.info("Event " + _eventManager.getClass().getSimpleName() + " will resume because is within the event period");
+	}
+}

trunk/java/com/l2jmobius/gameserver/model/eventengine/conditions/HaventRunConditionalScheduler.java

@@ -0,0 +1,91 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.model.eventengine.conditions;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.gameserver.model.eventengine.AbstractEventManager;
+import com.l2jmobius.gameserver.model.eventengine.EventScheduler;
+import com.l2jmobius.gameserver.model.eventengine.IConditionalEventScheduler;
+
+/**
+ * @author UnAfraid
+ */
+public class HaventRunConditionalScheduler implements IConditionalEventScheduler
+{
+	private static final Logger LOGGER = Logger.getLogger(HaventRunConditionalScheduler.class.getName());
+	private final AbstractEventManager<?> _eventManager;
+	private final String _name;
+	
+	public HaventRunConditionalScheduler(AbstractEventManager<?> eventManager, String name)
+	{
+		_eventManager = eventManager;
+		_name = name;
+	}
+	
+	@Override
+	public boolean test()
+	{
+		final EventScheduler mainScheduler = _eventManager.getScheduler(_name);
+		if (mainScheduler == null)
+		{
+			throw new NullPointerException("Scheduler not found: " + _name);
+		}
+		
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("SELECT lastRun FROM event_schedulers WHERE eventName = ? AND schedulerName = ?"))
+		{
+			ps.setString(1, _eventManager.getName());
+			ps.setString(2, mainScheduler.getName());
+			try (ResultSet rs = ps.executeQuery())
+			{
+				if (rs.next())
+				{
+					final long lastRun = rs.getTimestamp(1).getTime();
+					final long lastPossibleRun = mainScheduler.getPrevSchedule();
+					return (lastPossibleRun > lastRun) && (Math.abs(lastPossibleRun - lastRun) > 1000);
+				}
+			}
+		}
+		catch (SQLException e)
+		{
+			LOGGER.log(Level.WARNING, "Failed to retreive information for scheduled task event manager: " + _eventManager.getClass().getSimpleName() + " scheduler: " + _name, e);
+		}
+		return false;
+	}
+	
+	@Override
+	public void run()
+	{
+		final EventScheduler mainScheduler = _eventManager.getScheduler(_name);
+		if (mainScheduler == null)
+		{
+			throw new NullPointerException("Scheduler not found: " + _name);
+		}
+		
+		if (mainScheduler.updateLastRun())
+		{
+			mainScheduler.run();
+		}
+	}
+}