From 49456557d53464b5927e3f9f67286241874987e7 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 13 Feb 2020 10:04:46 +0000
Subject: [PATCH] Replaced getId with getRewardId for mission queries.
 Contributed by codered.

---
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 .../gameserver/handler/AbstractDailyMissionHandler.java       | 4 ++--
 14 files changed, 28 insertions(+), 28 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 3e0e547fa2..723c641a84 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 3e0e547fa2..723c641a84 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 9c934ee0f2..8ea73d1fe5 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 9c934ee0f2..8ea73d1fe5 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 9c934ee0f2..8ea73d1fe5 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 9c934ee0f2..8ea73d1fe5 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 3e0e547fa2..723c641a84 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}
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 b908d785f1..5d2663371f 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.getId());
+			ps.setInt(2, _holder.getRewardId());
 			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.getId());
+			final DailyMissionPlayerEntry entry = new DailyMissionPlayerEntry(objectId, _holder.getRewardId());
 			_entries.put(objectId, entry);
 			return entry;
 		}