Fixed DailyMission reward id was always 0 in database.

Contributed by facab.

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -45,7 +44,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -45,7 +44,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -45,7 +44,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;

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;
 		}

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<ItemHolder> _rewardsItems;
 	private final List<ClassId> _classRestriction;
 	private final int _requiredCompletions;
@@ -48,7 +47,6 @@ public class DailyMissionDataHolder
 	{
 		final Function<DailyMissionDataHolder, AbstractDailyMissionHandler> 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<ClassId> getClassRestriction()
 	{
 		return _classRestriction;