Replaced getId with getRewardId for mission queries.
Contributed by codered.
This commit is contained in:
@@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
@@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?"))
|
||||||
{
|
{
|
||||||
ps.setInt(1, objectId);
|
ps.setInt(1, objectId);
|
||||||
ps.setInt(2, _holder.getId());
|
ps.setInt(2, _holder.getRewardId());
|
||||||
try (ResultSet rs = ps.executeQuery())
|
try (ResultSet rs = ps.executeQuery())
|
||||||
{
|
{
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
@@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
|
|||||||
|
|
||||||
if (createIfNone)
|
if (createIfNone)
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId());
|
final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
|
||||||
_entries.put(objectId, entry);
|
_entries.put(objectId, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user