From e335f011e51d61fb33f982bed9d798189e56effc Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 29 Jan 2022 07:42:22 +0000
Subject: [PATCH] Non quest scripts should use giveItems method.

---
 .../game/data/scripts/events/L2Day/L2Day.java | 12 +--
 .../gameserver/model/quest/Quest.java         | 74 +++++++++++++++++++
 .../game/data/scripts/events/L2Day/L2Day.java | 12 +--
 .../gameserver/model/quest/Quest.java         | 74 +++++++++++++++++++
 .../game/data/scripts/events/L2Day/L2Day.java | 12 +--
 .../game/data/scripts/events/L2Day/L2Day.java | 12 +--
 6 files changed, 172 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/events/L2Day/L2Day.java
index 1c69a61f36..dce7e0a6b4 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -99,7 +99,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 2);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 2);
 					}
 					else
 					{
@@ -107,7 +107,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -128,7 +128,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
 					}
 					else
 					{
@@ -136,7 +136,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -157,7 +157,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
 					}
 					else
 					{
@@ -165,7 +165,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/Quest.java
index fc1a8a1660..3d10d52361 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -2165,6 +2165,80 @@ public class Quest extends ManagedScript
 		player.sendPacket(su);
 	}
 	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 */
+	public static void giveItems(Player player, int itemId, int count)
+	{
+		giveItems(player, itemId, count, 0);
+	}
+	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param holder
+	 */
+	protected static void giveItems(Player player, ItemHolder holder)
+	{
+		giveItems(player, holder.getId(), holder.getCount());
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param enchantlevel
+	 */
+	public static void giveItems(Player player, int itemId, int count, int enchantlevel)
+	{
+		if (count <= 0)
+		{
+			return;
+		}
+		
+		// Add items to player's inventory
+		final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null)
+		{
+			return;
+		}
+		
+		// set enchant level for item if that item is not adena
+		if ((enchantlevel > 0) && (itemId != 57))
+		{
+			item.setEnchantLevel(enchantlevel);
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param attributeId
+	 * @param attributeLevel
+	 */
+	public static void giveItems(Player player, int itemId, int count, byte attributeId, int attributeLevel)
+	{
+		if (count <= 0)
+		{
+			return;
+		}
+		
+		// Add items to player's inventory
+		final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null)
+		{
+			return;
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
 	/**
 	 * Get a random integer from 0 (inclusive) to {@code max} (exclusive).<br>
 	 * Use this method instead of importing {@link org.l2jmobius.commons.util.Rnd} utility.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
index cf4048b9df..ffa1b0a4ed 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -114,7 +114,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 2);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 2);
 					}
 					else
 					{
@@ -122,7 +122,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -143,7 +143,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
 					}
 					else
 					{
@@ -151,7 +151,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -172,7 +172,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getNpcId()), 1);
+						giveItems(player, MANAGERS.get(npc.getNpcId()), 1);
 					}
 					else
 					{
@@ -180,7 +180,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
index fc1a8a1660..3d10d52361 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -2165,6 +2165,80 @@ public class Quest extends ManagedScript
 		player.sendPacket(su);
 	}
 	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 */
+	public static void giveItems(Player player, int itemId, int count)
+	{
+		giveItems(player, itemId, count, 0);
+	}
+	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param holder
+	 */
+	protected static void giveItems(Player player, ItemHolder holder)
+	{
+		giveItems(player, holder.getId(), holder.getCount());
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param enchantlevel
+	 */
+	public static void giveItems(Player player, int itemId, int count, int enchantlevel)
+	{
+		if (count <= 0)
+		{
+			return;
+		}
+		
+		// Add items to player's inventory
+		final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null)
+		{
+			return;
+		}
+		
+		// set enchant level for item if that item is not adena
+		if ((enchantlevel > 0) && (itemId != 57))
+		{
+			item.setEnchantLevel(enchantlevel);
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param attributeId
+	 * @param attributeLevel
+	 */
+	public static void giveItems(Player player, int itemId, int count, byte attributeId, int attributeLevel)
+	{
+		if (count <= 0)
+		{
+			return;
+		}
+		
+		// Add items to player's inventory
+		final Item item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null)
+		{
+			return;
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
 	/**
 	 * Get a random integer from 0 (inclusive) to {@code max} (exclusive).<br>
 	 * Use this method instead of importing {@link org.l2jmobius.commons.util.Rnd} utility.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
index 131d98d9a3..a76a9d35bc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -162,7 +162,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 2);
+						giveItems(player, MANAGERS.get(npc.getId()), 2);
 					}
 					else
 					{
@@ -170,7 +170,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -191,7 +191,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 1);
+						giveItems(player, MANAGERS.get(npc.getId()), 1);
 					}
 					else
 					{
@@ -199,7 +199,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -220,7 +220,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 1);
+						giveItems(player, MANAGERS.get(npc.getId()), 1);
 					}
 					else
 					{
@@ -228,7 +228,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
index 131d98d9a3..a76a9d35bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -162,7 +162,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 2);
+						giveItems(player, MANAGERS.get(npc.getId()), 2);
 					}
 					else
 					{
@@ -170,7 +170,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -191,7 +191,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 1);
+						giveItems(player, MANAGERS.get(npc.getId()), 1);
 					}
 					else
 					{
@@ -199,7 +199,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}
@@ -220,7 +220,7 @@ public class L2Day extends LongTimeEvent
 					final int random = getRandom(100);
 					if (random >= 95)
 					{
-						rewardItems(player, MANAGERS.get(npc.getId()), 1);
+						giveItems(player, MANAGERS.get(npc.getId()), 1);
 					}
 					else
 					{
@@ -228,7 +228,7 @@ public class L2Day extends LongTimeEvent
 						{
 							if (random >= holder.getChance())
 							{
-								rewardItems(player, holder);
+								giveItems(player, holder);
 								break;
 							}
 						}