Correction for dailyReset logic.

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -71,8 +71,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -84,22 +87,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -71,8 +71,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -84,22 +87,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -84,8 +84,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -97,22 +100,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -84,8 +84,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -97,22 +100,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -84,8 +84,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -97,22 +100,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -84,8 +84,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -97,22 +100,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -71,8 +71,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -84,22 +87,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java

@@ -77,8 +77,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 	
 	public synchronized void reset()
 	{
-		if (_holder.dailyReset())
+		if (!_holder.dailyReset())
 		{
+			return;
+		}
+		
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
 		{
@@ -90,22 +93,11 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
 		{
 			LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
 		}
-		}
+		finally
-		else
 		{
-			try (Connection con = DatabaseFactory.getConnection();
-				PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
-			{
-				ps.setInt(1, _holder.getId());
-				ps.execute();
-			}
-			catch (SQLException e)
-			{
-				LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
-			}
-		}
 			_entries.clear();
 		}
+	}
 	
 	public boolean requestReward(PlayerInstance player)
 	{