Correction for dailyReset logic.

This commit is contained in:
MobiusDevelopment 2019-11-14 08:39:05 +00:00
parent e5857a4f25
commit 3f5e226e66
14 changed files with 224 additions and 336 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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