From c5dcbae4f9f2ae0e7d5c8b6ced48edb3eb8e3e75 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 5 May 2020 10:39:17 +0000 Subject: [PATCH] Fixed DailyMission reward id was always 0 in database. Contributed by facab. --- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- .../gameserver/handler/AbstractDailyMissionHandler.java | 4 ++-- .../l2jmobius/gameserver/model/DailyMissionDataHolder.java | 7 ------- 28 files changed, 28 insertions(+), 126 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 647ee7b159..1673fb1298 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8d35d1688f..22bc00c260 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -45,7 +44,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -60,11 +58,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 647ee7b159..1673fb1298 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8d35d1688f..22bc00c260 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -45,7 +44,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -60,11 +58,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 9fa751bf0b..9894cb3e94 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 77bfcb0951..771af1a0a5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8ce49d7590..9875458c7e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 77bfcb0951..771af1a0a5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8ce49d7590..9875458c7e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 77bfcb0951..771af1a0a5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8ce49d7590..9875458c7e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 77bfcb0951..771af1a0a5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -176,7 +176,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -193,7 +193,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8ce49d7590..9875458c7e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 647ee7b159..1673fb1298 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -147,7 +147,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -164,7 +164,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 8d35d1688f..22bc00c260 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -45,7 +44,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -60,11 +58,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 5dc706578c..b3199b0dd4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -154,7 +154,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer PreparedStatement ps = con.prepareStatement("SELECT * FROM character_daily_rewards WHERE charId = ? AND rewardId = ?")) { ps.setInt(1, objectId); - ps.setInt(2, _holder.getRewardId()); + ps.setInt(2, _holder.getId()); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) @@ -171,7 +171,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer if (createIfNone) { - final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId()); + final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getId()); _entries.put(objectId, entry); return entry; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 4c0b6c9104..57380dea40 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; public class DailyMissionDataHolder { private final int _id; - private final int _rewardId; private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; @@ -48,7 +47,6 @@ public class DailyMissionDataHolder { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); _id = set.getInt("id"); - _rewardId = set.getInt("reward_id", 0); _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); @@ -66,11 +64,6 @@ public class DailyMissionDataHolder return _id; } - public int getRewardId() - { - return _rewardId; - } - public List getClassRestriction() { return _classRestriction;