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,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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{

View File

@@ -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);
}
}
else
finally
{
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)
{